summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorXinglu Chen <public@yoctocell.xyz>2021-10-30 12:42:44 +0200
committerLudovic Courtès <ludo@gnu.org>2021-10-31 00:51:06 +0200
commitea19381bd9405bdb711c36b534e463fc7c8ca949 (patch)
tree26cbfb0e562efec7a9f6eeb4d207b24e555c798e /guix
parent40acbaf0789d47464062622bef463921556c2235 (diff)
guix home: import: Call ‘local-file’ with ‘name’
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. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix')
-rw-r--r--guix/scripts/home/import.scm20
1 files changed, 16 insertions, 4 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 @@
;;;
;;; 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 @@
(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))))