summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-12-14 10:35:54 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-12-16 00:14:30 -0500
commit7ce9b7e7062eee406e269bc40a20247973732be2 (patch)
treea35eb8aed5c76f2c042f6f1ff311f785d85bbfa2
parent1febafb4af8dbe8a68ef501d7d28e56e49d172f8 (diff)
downloadguix-7ce9b7e7062eee406e269bc40a20247973732be2.tar.gz
guix-install.sh: Directly exit in case of errors in chk_require.
* etc/guix-install.sh (chk_require): Directly exit in case of errors in
chk_require, instead of relying on 'set -e'.
-rwxr-xr-xetc/guix-install.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index b8ea9e54c3..3ce9affc06 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -121,10 +121,8 @@ chk_require()
         command -v "$c" &>/dev/null || warn+=("$c")
     done
 
-    [ "${#warn}" -ne 0 ] &&
-        { _err "${ERR}Missing commands: ${warn[*]}.";
-          return 1; }
-    
+    [ "${#warn}" -ne 0 ] && die "Missing commands: ${warn[*]}."
+
     _msg "${PAS}verification of required commands completed"
 }