From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id gMZsBlvHumXLcQAAe85BDQ:P1 (envelope-from ) for ; Wed, 31 Jan 2024 23:19:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id gMZsBlvHumXLcQAAe85BDQ (envelope-from ) for ; Wed, 31 Jan 2024 23:19:07 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=RztKwwDa; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706739547; a=rsa-sha256; cv=none; b=aYUxcjvoEZKL8dkYKmHQ6ivWIlViESwWJk9sO9R0FiD2eDN6vTzISjnXUI72o0rAQ2pgKT a5aR7y2BUEhqgAqtpb1eqm01g1/vIUG4p+jOw/B8D5lforU+VqCZ63M+5cHd3Ax2St6q1g 3YttIBsQbO0IxHjwMxuU8JQ/C1gg8fhb5nn3Im2udt+gQ74wTYzGnOVzl1ak6+KJd4GdFx GrGljh+iC5HYeN93sHcwDGBV/HTxE02hGzd8Rqhv3rBEPdkazDYsCXr48w/YOGFoQMQ21/ /LsBQDgMtqahaXJSLLIY58QxurAlivwALNSh5XR9ALzzriyEg7i9sSxP1EK2Xg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=autistici.org header.s=stigmate header.b=RztKwwDa; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706739547; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=JlNHK2Cz5KbFRmoeeQOQEAfmo1lD6jTu8GQlpz6MB/8=; b=MhVpmLO5IE2h3b8GHJ6htqGfLAPrtDZxqC8atIwMfr9m1m3WmRS4nrMpA6YEy5RPVtAwHH 6RiRb8qJcX8U1SJnoSJOxiJ9gsQdUltft3T4Ukv6b1Ah5PBGZHU1MEQT+CKTyZU2ep+NOX LdfJfBGU6u4ACwLS9ewVjVKX5VOBopMd8X6gPRBRBOhwSc7ewlBnXI3S1tQ9LRAqJU3c4M TFX5lBgl52N7aKvasLr46Bx54lqOKBM7CXB/n11qfz2zmVhyGsQe3R5zeOyddCY2CoYcbM 6rV3KPruJjCVOSAHYDclBXv2o5xfGRAAUegAuOMO7YW4jw0p6F/gFm6yBLzasQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F166D70A72 for ; Wed, 31 Jan 2024 23:19:06 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVIv0-0005Zm-4s; Wed, 31 Jan 2024 17:18:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVIuy-0005Zd-H5 for guix-patches@gnu.org; Wed, 31 Jan 2024 17:18:52 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVIuy-0005tF-96 for guix-patches@gnu.org; Wed, 31 Jan 2024 17:18:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rVIv7-00067B-TG for guix-patches@gnu.org; Wed, 31 Jan 2024 17:19:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68857] [PATCH] gnu: home: dotfiles: Avoid creating extra directory in $HOME. References: <14bc720d-7fdc-516a-3018-58294c1cafcd@autistici.org> In-Reply-To: <14bc720d-7fdc-516a-3018-58294c1cafcd@autistici.org> Resent-From: Giacomo Leidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Jan 2024 22:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68857 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 68857@debbugs.gnu.org Cc: Giacomo Leidi Received: via spool by 68857-submit@debbugs.gnu.org id=B68857.170673948823442 (code B ref 68857); Wed, 31 Jan 2024 22:19:01 +0000 Received: (at 68857) by debbugs.gnu.org; 31 Jan 2024 22:18:08 +0000 Received: from localhost ([127.0.0.1]:39184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rVIuF-000662-LP for submit@debbugs.gnu.org; Wed, 31 Jan 2024 17:18:07 -0500 Received: from confino.investici.org ([2a11:7980:1::2:0]:46797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rVIuD-00065r-4Y for 68857@debbugs.gnu.org; Wed, 31 Jan 2024 17:18:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=autistici.org; s=stigmate; t=1706739474; bh=JlNHK2Cz5KbFRmoeeQOQEAfmo1lD6jTu8GQlpz6MB/8=; h=From:To:Cc:Subject:Date:From; b=RztKwwDaFwszuzW6QUAlmzSZ9+6cGceeBgBQmv+8jla+jiTCm2YNg+Tb8tS0TYMf3 hhr6UpKeRh/Es2gL2J9BDQPuZegr77rLJqwO9tg1ASlgkS8gEHT1HRWGgwnwq0+R/7 0V3ab8lnlCiyUya+fhZ+qz4FBRM5PM1JhnT1GgdM= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4TQGcy5bKhz11Ft; Wed, 31 Jan 2024 22:17:54 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: goodoldpaul@autistici.org) by localhost (Postfix) with ESMTPSA id 4TQGcy4qj6z11Fn; Wed, 31 Jan 2024 22:17:54 +0000 (UTC) Date: Wed, 31 Jan 2024 23:17:48 +0100 Message-ID: <20240131221748.1190-1-goodoldpaul@autistici.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Giacomo Leidi X-ACL-Warn: , Giacomo Leidi via Guix-patches From: Giacomo Leidi via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -5.76 X-Migadu-Queue-Id: F166D70A72 X-Migadu-Spam-Score: -5.76 X-TUID: wK4gqc7o+32E This patch applies the fix from https://issues.guix.gnu.org/60521#43 , it is supposed to fix https://issues.guix.gnu.org/68848 . * gnu/home/services/dotfiles.scm (import-dotfiles)[strip]: Drop extra directory. Change-Id: I98b747396e1fc8a8925204cde2bb705019ce2c1d --- gnu/home/services/dotfiles.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/home/services/dotfiles.scm b/gnu/home/services/dotfiles.scm index 6a740c42ce..fc842f1fb3 100644 --- a/gnu/home/services/dotfiles.scm +++ b/gnu/home/services/dotfiles.scm @@ -58,7 +58,11 @@ (define (import-dotfiles directory files) generated by recursively visiting DIRECTORY and mapping its contents to the user's home directory, excluding files that match any of the patterns in EXCLUDED." (define (strip file) - (string-drop file (+ 1 (string-length directory)))) + (string-join + (cdr + (string-split (string-drop file (+ 1 (string-length directory))) + #\/)) + "/")) (define (format file) ;; Remove from FILE characters that cannot be used in the store. base-commit: bf7991a8c767abd32cfb2c92e3d57665a7cabf00 -- 2.41.0