[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#60069] [PATCH 2/2] guix-install.sh: Directly exit in case of errors
From: |
Maxim Cournoyer |
Subject: |
[bug#60069] [PATCH 2/2] guix-install.sh: Directly exit in case of errors in chk_require. |
Date: |
Wed, 14 Dec 2022 10:56:03 -0500 |
* 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 06730f7e3f..0ca12f8b66 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -137,10 +137,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"
}
--
2.38.1