From 593fe736674fadedd961c499e5758fa9c96a57aa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 18 May 2018 10:51:29 -0400 Subject: guix-install.sh: Fix chk_require exiting without warning. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * etc/guix-install.sh (chk_require): Because of the set -e option, Bash was exiting when the command `command -v "$c" &>/dev/null' was running on its own. Instead, we now test the command and accumulate warning messages in a single statement by chaining the command with a logical OR. Signed-off-by: Ludovic Courtès --- etc/guix-install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'etc') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 78cd7580bb..d9f1955098 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -86,9 +86,7 @@ chk_require() _debug "--- [ $FUNCNAME ] ---" for c in ${cmds[@]}; do - command -v "$c" &>/dev/null - [ "$?" -eq "1" ] && - warn+=("$c") + command -v "$c" &>/dev/null || warn+=("$c") done [ "${#warn}" -ne 0 ] && -- cgit v1.2.3