From: Xinglu Chen <public@yoctocell.xyz>
To: 50873@debbugs.gnu.org, "Oleg Pykhalov" <go.wigust@gmail.com>,
"Andrew Tropin" <andrew@trop.in>,
"Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#50873] [PATCH v3 8/8] guix home: import: Call ‘local-file’ with ‘name’
Date: Sat, 30 Oct 2021 12:42:44 +0200 [thread overview]
Message-ID: <19dd061d4f7a3aab24ecb660df01e3c6613d4ae7.1635590221.git.public@yoctocell.xyz> (raw)
In-Reply-To: <cover.1635590221.git.public@yoctocell.xyz>
Set the name of the file to just the basename of the file passed to
‘local-file’.
* guix/scripts/home/import.scm (basename+remove-dots): New procedure.
(generate-bash-configuration+modules): Use it.
* tests/home-import.scm (match-home-environment-bash-service): Adjust
accordingly.
---
guix/scripts/home/import.scm | 20 ++++++++++++++++----
tests/home-import.scm | 3 ++-
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm
index 6e3ed065d5..a0022458f6 100644
--- a/guix/scripts/home/import.scm
+++ b/guix/scripts/home/import.scm
@@ -39,7 +39,16 @@ (define-module (guix scripts home import)
;;;
;;; Code:
-
+(define (basename+remove-dots file-name)
+ "Remove the dot from the dotfile FILE-NAME; replace the other dots in
+FILE-NAME with \"-\", and return the basename of it."
+ (string-map (match-lambda
+ (#\. #\-)
+ (c c))
+ (let ((base (basename file-name)))
+ (if (string-prefix? "." base)
+ (string-drop base 1)
+ base))))
(define (generate-bash-configuration+modules destination-directory)
(define (destination-append path)
@@ -52,15 +61,18 @@ (define (destination-append path)
(home-bash-configuration
,@(if (file-exists? rc)
`((bashrc
- (list (local-file ,rc))))
+ (list (local-file ,rc
+ ,(basename+remove-dots rc)))))
'())
,@(if (file-exists? profile)
`((bash-profile
- (list (local-file ,profile))))
+ (list (local-file ,profile
+ ,(basename+remove-dots profile)))))
'())
,@(if (file-exists? logout)
`((bash-logout
- (list (local-file ,logout))))
+ (list (local-file ,logout
+ ,(basename+remove-dots logout)))))
'())))
(guix gexp)
(gnu home services shells))))
diff --git a/tests/home-import.scm b/tests/home-import.scm
index a4e71fa698..d2f5728e3c 100644
--- a/tests/home-import.scm
+++ b/tests/home-import.scm
@@ -156,7 +156,8 @@ (define-home-environment-matcher match-home-environment-bash-service
'home-bash-service-type
('home-bash-configuration
('bashrc
- ('list ('local-file "/tmp/guix-config/.bashrc"))))))))))
+ ('list ('local-file "/tmp/guix-config/.bashrc"
+ "bashrc"))))))))))
(test-assert "manifest->code: No services"
(eval-test-with-home-environment
--
2.33.0
next prev parent reply other threads:[~2021-10-30 10:44 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 17:33 [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Xinglu Chen
2021-09-28 17:35 ` [bug#50873] [PATCH 1/5] guix home: import: Make the user to specify a destination directory Xinglu Chen
2021-09-28 17:35 ` [bug#50873] [PATCH 2/5] guix home: import: Allow multiple modules to be imported for each service Xinglu Chen
2021-09-28 17:35 ` [bug#50873] [PATCH 3/5] guix home: import: Fix module name for Bash service Xinglu Chen
2021-09-28 17:36 ` [bug#50873] [PATCH 4/5] guix home: import: Delete duplicate modules when importing Xinglu Chen
2021-09-28 17:36 ` [bug#50873] [PATCH 5/5] doc: Document the ‘guix home import’ subcommand Xinglu Chen
2021-09-30 7:08 ` Andrew Tropin
2021-10-01 5:08 ` Xinglu Chen
2021-10-02 15:10 ` [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Ludovic Courtès
2021-09-28 20:52 ` [bug#50873] [PATCH 0/2] Add pn Antero Mejr via Guix-patches via
2021-09-28 20:52 ` [bug#50873] [PATCH 1/2] gnu: Add libphonenumber Antero Mejr via Guix-patches via
2021-09-28 20:52 ` [bug#50873] [PATCH 2/2] gnu: Add pn Antero Mejr via Guix-patches via
2021-10-02 15:13 ` [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Ludovic Courtès
2021-10-02 18:45 ` Xinglu Chen
2021-10-10 10:19 ` [bug#50873] [PATCH 0/7] " Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 1/7] guix home: import: Make the user to specify a destination directory Xinglu Chen
2021-10-13 9:24 ` [bug#50873] [PATCH 0/5] Fixes to ‘guix home import’ Ludovic Courtès
2021-10-29 13:37 ` Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 2/7] guix home: import: Allow multiple modules to be imported for each service Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 3/7] guix home: import: Fix module name for Bash service Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 4/7] guix home: import: Don’t use 'slurp-file-gexp' Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 5/7] guix home: import: Delete duplicate modules when importing Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 6/7] doc: Document the ‘guix home import’ subcommand Xinglu Chen
2021-10-10 10:20 ` [bug#50873] [PATCH 7/7] Add tests for ‘guix home import’ Xinglu Chen
2021-10-11 13:00 ` [bug#50873] [PATCH 0/5] Fixes to " Oleg Pykhalov
2021-10-13 9:25 ` Ludovic Courtès
2021-10-29 7:36 ` Ludovic Courtès
2021-10-29 13:47 ` Xinglu Chen
2021-10-30 14:17 ` Ludovic Courtès
2021-10-30 10:42 ` [bug#50873] [PATCH v3 0/8] " Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 1/8] guix home: import: Make the user to specify a destination directory Xinglu Chen
2021-10-30 14:22 ` Liliana Marie Prikler
2021-10-30 10:42 ` [bug#50873] [PATCH v3 2/8] guix home: import: Allow multiple modules to be imported for each service Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 3/8] guix home: import: Fix module name for Bash service Xinglu Chen
2021-10-30 11:50 ` Julien Lepiller
2021-10-30 10:42 ` [bug#50873] [PATCH v3 4/8] guix home: import: Don’t use 'slurp-file-gexp' Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 5/8] guix home: import: Delete duplicate modules when importing Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 6/8] doc: Document the ‘guix home import’ subcommand Xinglu Chen
2021-10-30 10:42 ` [bug#50873] [PATCH v3 7/8] Add tests for ‘guix home import’ Xinglu Chen
2021-10-30 10:42 ` Xinglu Chen [this message]
2021-10-30 23:01 ` [bug#50873] [PATCH 0/5] Fixes to " Ludovic Courtès
2021-10-31 17:38 ` Xinglu Chen
2021-11-01 6:31 ` Andrew Tropin
2021-11-06 17:00 ` 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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19dd061d4f7a3aab24ecb660df01e3c6613d4ae7.1635590221.git.public@yoctocell.xyz \
--to=public@yoctocell.xyz \
--cc=50873@debbugs.gnu.org \
--cc=andrew@trop.in \
--cc=go.wigust@gmail.com \
--cc=ludo@gnu.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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).