02/02: guix-install.sh: Directly exit in case of errors in chk_require.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 7ce9b7e7062eee406e269bc40a20247973732be2
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Dec 14 10:35:54 2022 -0500

    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'.
---
 etc/guix-install.sh | 6 ++----
 1 file 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"
 }