[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
- [bug#40601] [PATCH 04/28] guix-install.sh: Handle local binary tarball file., (continued)
- [bug#40601] [PATCH 02/28] guix-install.sh: Add xz to requirements., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 03/28] guix-install.sh: Fix systemctl not found error message at probe., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 06/28] guix-install.sh: trivial whitespace fix., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 08/28] guix-install.sh: Use getent for both user & group presence checking., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 05/28] guix-install.sh, guix-binary tarball: Handle runit-based foreign distributions., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 10/28] guix-install.sh: Replace subshell-inducing command grouping., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 12/28] guix-install.sh: Rework user & group handling, adding busybox support., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 13/28] guix-install.sh: Make grep & mktemp usage compatible with busybox., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 14/28] guix-install.sh: Make tar usage compatible with busybox., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 18/28] Replace the use of "which" by "command -v",
Vincent Legoll <=
- [bug#40601] [PATCH 15/28] guix-install.sh, guix-binary tarball: Handle openrc-based foreign distributions., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 19/28] Remove &> and >& bashisms, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 20/28] Add missing variable quoting & curly-bracketing for dl_path, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 21/28] Remove unused variable, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 24/28] Remove some "[[" bashisms, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 11/28] guix-install.sh: Use a variable for GPG key URL., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 23/28] Remove $UID bashism, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 09/28] guix-install.sh: Fix requirements., Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 17/28] fix variable quoting in sys_make_guix_available, Vincent Legoll, 2020/05/17
- [bug#40601] [PATCH 16/28] non-interactive mode, usage, Vincent Legoll, 2020/05/17