From patchwork Wed Jan 31 22:17:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: paul X-Patchwork-Id: 59673 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A6B2A27BBE9; Wed, 31 Jan 2024 22:19:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F214827BBE2 for ; Wed, 31 Jan 2024 22:19:06 +0000 (GMT) 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 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 X-Patchwork-Original-From: Giacomo Leidi via Guix-patches via From: paul Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: bf7991a8c767abd32cfb2c92e3d57665a7cabf00 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.