From 7ce9b7e7062eee406e269bc40a20247973732be2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 14 Dec 2022 10:35:54 -0500 Subject: 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(-) (limited to 'etc') 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" } -- cgit 1.4.1