all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Giacomo Leidi via Guix-patches via <guix-patches@gnu.org>
To: 68857@debbugs.gnu.org
Cc: Giacomo Leidi <goodoldpaul@autistici.org>
Subject: [bug#68857] [PATCH] gnu: home: dotfiles: Avoid creating extra directory in $HOME.
Date: Wed, 31 Jan 2024 23:17:48 +0100	[thread overview]
Message-ID: <20240131221748.1190-1-goodoldpaul@autistici.org> (raw)
In-Reply-To: <14bc720d-7fdc-516a-3018-58294c1cafcd@autistici.org>

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





  reply	other threads:[~2024-01-31 22:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-31 22:15 [bug#68857] gnu: home: dotfiles: Avoid creating extra directory in $HOME paul via Guix-patches via
2024-01-31 22:17 ` Giacomo Leidi via Guix-patches via [this message]
2024-02-07  0:54 ` [bug#68857] [PATCH] " paul via Guix-patches via
2024-02-07  8:05   ` Janneke Nieuwenhuizen
2024-02-07  8:37     ` Janneke Nieuwenhuizen
2024-02-16 17:16   ` paul via Guix-patches via
2024-02-16 18:57     ` Sergey Trofimov
2024-02-16 17:17 ` [bug#68857] [PATCH v2] gnu: home: dotfiles: Properly support both plain and Stow directory layouts Giacomo Leidi via Guix-patches via
2024-02-20  9:37   ` [bug#68857] gnu: home: dotfiles: Avoid creating extra directory in $HOME Ludovic Courtès
2024-02-20 18:38     ` paul via Guix-patches via
2024-02-27 10:17       ` Ludovic Courtès
2024-02-27 11:30         ` Giacomo Leidi
2024-02-27 11:32         ` paul via Guix-patches via
2024-02-27 12:35 ` [bug#68857] [PATCH v3] gnu: home: dotfiles: Properly support both plain and Stow directory layouts Giacomo Leidi via Guix-patches via
2024-03-04 15:46   ` [bug#68857] gnu: home: dotfiles: Avoid creating extra directory in $HOME Ludovic Courtès
2024-03-06 20:51     ` paul via Guix-patches via
2024-03-06 20:52 ` [bug#68857] [PATCH v4] gnu: home: dotfiles: Properly support both plain and Stow directory layouts Giacomo Leidi via Guix-patches via
2024-03-06 22:15   ` bug#68848: bug#68857: gnu: home: dotfiles: Avoid creating extra directory in $HOME Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240131221748.1190-1-goodoldpaul@autistici.org \
    --to=guix-patches@gnu.org \
    --cc=68857@debbugs.gnu.org \
    --cc=goodoldpaul@autistici.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.