aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-09-29 16:53:17 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2021-09-29 16:56:40 +0200
commite4ed0b3969ddbe44347c468c96ccfa057b2dd256 (patch)
tree6be8f5add89fc9438f69c906516b8dae961a1031 /etc
parentbc5152a25d1f1f695f5ccb844cfe30064f91efd2 (diff)
downloadguix-e4ed0b3969ddbe44347c468c96ccfa057b2dd256.tar
guix-e4ed0b3969ddbe44347c468c96ccfa057b2dd256.tar.gz
guix-install.sh: Don't swallow wget errors.
Using ‘-q’ suppresses *all* stderr output, including errors. * etc/guix-install.sh (chk_gpg_keyring, guix_get_bin_list, guix_get_bin): Substitute ‘--no-verbose’ for ‘-q’. Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>
Diffstat (limited to 'etc')
-rwxr-xr-xetc/guix-install.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 4f0f89100d..b0d4a8b95e 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -139,12 +139,12 @@ chk_gpg_keyring()
required to verify the Guix binary signature: $gpg_key_id.
Would you like me to fetch it for you? (yes/no)"; then
wget "https://sv.gnu.org/people/viewgpg.php?user_id=$user_id" \
- -qO - | gpg --import -
+ --no-verbose -O- | gpg --import -
else
_err "${ERR}Missing OpenPGP public key ($gpg_key_id).
Fetch it with this command:
- wget \"https://sv.gnu.org/people/viewgpg.php?user_id=$user_id\" -qO - | \
+ wget \"https://sv.gnu.org/people/viewgpg.php?user_id=$user_id\" -O - | \
sudo -i gpg --import -"
exit_flag=yes
fi
@@ -272,7 +272,7 @@ guix_get_bin_list()
_debug "--- [ ${FUNCNAME[0]} ] ---"
# Filter only version and architecture
- bin_ver_ls=("$(wget -qO- "$gnu_url" \
+ bin_ver_ls=("$(wget "$gnu_url" --no-verbose -O- \
| sed -n -e 's/.*guix-binary-\([0-9.]*[a-z0-9]*\)\..*.tar.xz.*/\1/p' \
| sort -Vu)")
@@ -305,7 +305,7 @@ guix_get_bin()
_msg "${INF}Downloading Guix release archive"
wget --help | grep -q '\--show-progress' \
- && wget_args=("-q" "--show-progress")
+ && wget_args=("--no-verbose" "--show-progress")
if wget "${wget_args[@]}" -P "$dl_path" \
"${url}/${bin_ver}.tar.xz" "${url}/${bin_ver}.tar.xz.sig"; then