kreyren/guix-kreyren
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

guix-install.sh: Don't swallow wget errors.

Browse Source 
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>
This commit is contained in:
Tobias Geerinckx-Rice 2021-09-29 16:53:17 +02:00
parent bc5152a25d
commit e4ed0b3969
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/guix-install.sh
View File

@ -139,12 +139,12 @@ chk_gpg_keyring()
required to verify the Guix binary signature: $gpg_key_id. required to verify the Guix binary signature: $gpg_key_id.
Would you like me to fetch it for you? (yes/no)"; then Would you like me to fetch it for you? (yes/no)"; then
wget "https://sv.gnu.org/people/viewgpg.php?user_id=$user_id" \ wget "https://sv.gnu.org/people/viewgpg.php?user_id=$user_id" \
-qO - | gpg --import - --no-verbose -O- | gpg --import -
else else
_err "${ERR}Missing OpenPGP public key ($gpg_key_id). _err "${ERR}Missing OpenPGP public key ($gpg_key_id).
Fetch it with this command: 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 -" sudo -i gpg --import -"
exit_flag=yes exit_flag=yes
fi fi
@ -272,7 +272,7 @@ guix_get_bin_list()
_debug "--- [ ${FUNCNAME[0]} ] ---" _debug "--- [ ${FUNCNAME[0]} ] ---"
# Filter only version and architecture # 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' \ | sed -n -e 's/.*guix-binary-\([0-9.]*[a-z0-9]*\)\..*.tar.xz.*/\1/p' \
| sort -Vu)") | sort -Vu)")
@ -305,7 +305,7 @@ guix_get_bin()
_msg "${INF}Downloading Guix release archive" _msg "${INF}Downloading Guix release archive"
wget --help | grep -q '\--show-progress' \ wget --help | grep -q '\--show-progress' \
&& wget_args=("-q" "--show-progress") && wget_args=("--no-verbose" "--show-progress")
if wget "${wget_args[@]}" -P "$dl_path" \ if wget "${wget_args[@]}" -P "$dl_path" \
"${url}/${bin_ver}.tar.xz" "${url}/${bin_ver}.tar.xz.sig"; then "${url}/${bin_ver}.tar.xz" "${url}/${bin_ver}.tar.xz.sig"; then