[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: system: More 'file-append' instead of #~(string-append #$thing …
|
From: |
Ludovic Courtès |
|
Subject: |
02/02: system: More 'file-append' instead of #~(string-append #$thing …). |
|
Date: |
Wed, 1 Feb 2017 11:37:11 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit 357db1f91de9b3eb14be52a98cc804cdfd284f6d
Author: Ludovic Courtès <address@hidden>
Date: Wed Feb 1 12:30:56 2017 +0100
system: More 'file-append' instead of #~(string-append #$thing …).
* gnu/system/shadow.scm (<user-account>)[shell]: Use 'file-append'.
(%base-user-accounts): Likewise.
* gnu/system/grub.scm (%background-image): Likewise.
---
gnu/system/grub.scm | 4 ++--
gnu/system/shadow.scm | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 067b291..7df7d46 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -94,8 +94,8 @@ denoting a file name."
(define %background-image
(grub-image
(aspect-ratio 4/3)
- (file #~(string-append #$%artwork-repository
- "/grub/GuixSD-fully-black-4-3.svg"))))
+ (file (file-append %artwork-repository
+ "/grub/GuixSD-fully-black-4-3.svg"))))
(define %default-theme
;; Default theme contributed by Felipe López.
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index ee9d55c..1acfcc4 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -84,7 +84,7 @@
(create-home-directory? user-account-create-home-directory? ;Boolean
(default #t))
(shell user-account-shell ; gexp
- (default #~(string-append #$bash "/bin/bash")))
+ (default (file-append bash "/bin/bash")))
(system? user-account-system? ; Boolean
(default #f)))
@@ -131,7 +131,7 @@
(name "nobody")
(uid 65534)
(group "nogroup")
- (shell #~(string-append #$shadow "/sbin/nologin"))
+ (shell (file-append shadow "/sbin/nologin"))
(home-directory "/nonexistent")
(create-home-directory? #f)
(system? #t))))