[bug#31522] [PATCH] guix-install.sh: Fix chk_require exiting without warning.

[bug#31522] [PATCH] guix-install.sh: Fix chk_require exiting without warning.

[Maxim Cournoyer]

[-- Attachment #1: Type: text/plain, Size: 117 bytes --]

Attached is a patch to fix a problem in the detection of missing
programs in the guix-install.sh Bash script.

Maxim

[-- Attachment #2: 0001-guix-install.sh-Fix-chk_require-exiting-without-warn.patch --]
[-- Type: text/x-patch, Size: 1041 bytes --]

From 726d05a99529823d94c3fff1fa8619953e384b44 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Fri, 18 May 2018 10:51:29 -0400
Subject: [PATCH] guix-install.sh: Fix chk_require exiting without warning.

* 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.
---
 etc/guix-install.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 78cd7580b..d9f195509 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 ] &&
-- 
2.17.0

bug#31522: [PATCH] guix-install.sh: Fix chk_require exiting without warning.

[Ludovic Courtès]

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> From 726d05a99529823d94c3fff1fa8619953e384b44 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Fri, 18 May 2018 10:51:29 -0400
> Subject: [PATCH] guix-install.sh: Fix chk_require exiting without warning.
>
> * 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.

Applied, thanks!  :-)

Ludo'.