guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v"


From: Vincent Legoll
Subject: [bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v"
Date: Sun, 17 May 2020 19:17:15 +0200

---
 etc/guix-install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index e350fdb052..596ceb5b39 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -38,7 +38,6 @@ REQUIRE=(
     "wget"
     "gpg"
     "grep"
-    "which"
     "sed"
     "sort"
     "getent"
@@ -329,12 +328,13 @@ sys_create_build_user()
 
     _debug "--- [ $FUNCNAME ] ---"
 
+    NOLOGIN_SHELL="$(command -v nologin)"
     for i in $(seq -w 1 10); do
         if getent passwd "guixbuilder${i}" >/dev/null 2>&1; then
             if command -v usermod &>/dev/null; then
                 _msg "${INF}user is already in the system, resetting"
                 usermod -g guixbuild -G guixbuild           \
-                        -d /var/empty -s "$(which nologin)" \
+                        -d /var/empty -s "${NOLOGIN_SHELL}" \
                         -c "Guix build user $i"             \
                         "guixbuilder${i}"
             else
@@ -343,12 +343,12 @@ sys_create_build_user()
         else
             if command -v useradd &>/dev/null; then
                 useradd -g guixbuild -G guixbuild           \
-                        -d /var/empty -s "$(which nologin)" \
+                        -d /var/empty -s "${NOLOGIN_SHELL}" \
                         -c "Guix build user $i" --system    \
                         "guixbuilder${i}"
                 _msg "${PAS}user added <guixbuilder${i}>"
             elif command -v adduser &>/dev/null; then
-                adduser -G guixbuild -h /var/empty -s "$(which nologin)" \
+                adduser -G guixbuild -h /var/empty -s "${NOLOGIN_SHELL}" \
                         -H -S "guixbuilder${i}"
                 _msg "${PAS}user added <guixbuilder${i}>"
             else
-- 
2.26.2






reply via email to

[Prev in Thread] Current Thread [Next in Thread]