diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-07-08 17:32:53 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2019-07-08 17:47:39 +0200 |
| commit | 6c77d79a4994124150071b36bfbb74c18a4651b3 (patch) | |
| tree | 7c6a6709ebe46534f465aaf98e938feea27944e4 | |
| parent | b6dc08393e6a8313b88ce422fc3c1e4e9c0efc6f (diff) | |
| download | guix-6c77d79a4994124150071b36bfbb74c18a4651b3.tar guix-6c77d79a4994124150071b36bfbb74c18a4651b3.tar.gz | |
guix-install.sh: Treat REQUIRE as the array it is.
Don't flatten it into a string only to split it again later.
* etc/guix-install.sh (chk_require): Iterate over array elements, not
string tokens.
(main): Pass $REQUIRE as an array of arguments.
| -rwxr-xr-x | etc/guix-install.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index aa95cb4e20..d3f80d1a35 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -3,6 +3,7 @@ # Copyright © 2017 sharlatan <sharlatanus@gmail.com> # Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +# Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr> # # This file is part of GNU Guix. # @@ -85,14 +86,11 @@ _debug() chk_require() { # Check that every required command is available. - declare -a cmds declare -a warn - cmds=(${1}) - _debug "--- [ $FUNCNAME ] ---" - for c in ${cmds[@]}; do + for c in "$@"; do command -v "$c" &>/dev/null || warn+=("$c") done @@ -415,7 +413,7 @@ main() _msg "Starting installation ($(date))" chk_term - chk_require "${REQUIRE[*]}" + chk_require "${REQUIRE[@]}" chk_init_sys chk_sys_arch |