[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/15: guix home: import: Call ‘local-file’ with ‘name’
From: |
guix-commits |
Subject: |
08/15: guix home: import: Call ‘local-file’ with ‘name’ |
Date: |
Sat, 30 Oct 2021 18:52:35 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit ea19381bd9405bdb711c36b534e463fc7c8ca949
Author: Xinglu Chen <public@yoctocell.xyz>
AuthorDate: Sat Oct 30 12:42:44 2021 +0200
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>
---
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 6e3ed06..a002245 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))))
diff --git a/tests/home-import.scm b/tests/home-import.scm
index 691e819..40d9547 100644
--- a/tests/home-import.scm
+++ b/tests/home-import.scm
@@ -156,7 +156,8 @@ corresponding file."
'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
- branch master updated (cf0abb6 -> c4ac8cf), guix-commits, 2021/10/30
- 10/15: home: import: Clarify "destination directory"., guix-commits, 2021/10/30
- 04/15: guix home: import: Don’t use 'slurp-file-gexp'., guix-commits, 2021/10/30
- 13/15: doc: Mention "guix home import" upfront., guix-commits, 2021/10/30
- 12/15: home: import: Avoid duplication of 'manifest->code'., guix-commits, 2021/10/30
- 14/15: doc: Avoid misuse of @ref., guix-commits, 2021/10/30
- 08/15: guix home: import: Call ‘local-file’ with ‘name’,
guix-commits <=
- 05/15: guix home: import: Delete duplicate modules when importing., guix-commits, 2021/10/30
- 01/15: guix home: import: Make the user to specify a destination directory., guix-commits, 2021/10/30
- 03/15: guix home: import: Fix module name for Bash service., guix-commits, 2021/10/30
- 09/15: home: import: Compare procedures with 'eq?'., guix-commits, 2021/10/30
- 06/15: doc: Document the ‘guix home import’ subcommand., guix-commits, 2021/10/30
- 07/15: Add tests for ‘guix home import’., guix-commits, 2021/10/30
- 11/15: home: import: Factorize triplicated 'version-spec' procedure., guix-commits, 2021/10/30
- 02/15: guix home: import: Allow multiple modules to be imported for each service., guix-commits, 2021/10/30
- 15/15: doc: Mention 'guix home reconfigure' upfront., guix-commits, 2021/10/30