[lmi-commits] [lmi] master e5f740b: Revert "Make wget less verbose"

[Greg Chicares]

branch: master
commit e5f740b4f899e5bd7fa2a87c26e5b90641b8337e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Revert "Make wget less verbose"
    
    This reverts the two immediately-preceding commits, and reimplements
    them more sensibly.
---
 gwc/rh.sh         |  8 ++++----
 install_centos.sh | 20 ++++++++++----------
 install_redhat.sh | 20 ++++++++++----------
 lmi_setup_00.sh   | 20 ++++++++++----------
 lmi_setup_21.sh   |  6 +++---
 lmi_setup_42.sh   |  2 +-
 lmi_setup_inc.sh  |  2 --
 7 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/gwc/rh.sh b/gwc/rh.sh
index 585bbc7..8b7bc42 100644
--- a/gwc/rh.sh
+++ b/gwc/rh.sh
@@ -80,7 +80,7 @@ sudo cp -a /usr/share/libtool/config/config.guess 
/usr/share/libtool/build-aux/c
 # Configure zsh, for root as well as the user configured above.
 
 https://github.com/vadz/lmi/raw/master/gwc/.zshrc
-wget -N 'https://github.com/vadz/lmi/raw/master/gwc/.zshrc'
+wget -N -nv 'https://github.com/vadz/lmi/raw/master/gwc/.zshrc'
 mv .zshrc ~
 cp -a ~/.zshrc /home/${USER}/.zshrc
 chown ${USER}:${USER} /home/${USER}/.zshrc
@@ -89,7 +89,7 @@ chown ${USER}:${USER} /home/${USER}/.zshrc
 # '~/.vimrc' and '/etc/vim/vimrc.local', use '~/.vimrc' for all
 # customizations and copy that file for the normal user too.
 
-wget -N 'https://github.com/vadz/lmi/raw/master/gwc/.vimrc'
+wget -N -nv 'https://github.com/vadz/lmi/raw/master/gwc/.vimrc'
 mv .vimrc ~
 cp -a ~/.vimrc /home/${USER}/.vimrc
 chown ${USER}:${USER} /home/${USER}/.vimrc
@@ -100,7 +100,7 @@ mkdir ~/.vim
 mkdir /home/${USER}/.vim
 chown ${USER}:${USER} /home/${USER}/.vim
 # It's a much better idea to copy a mature spellfile hither:
-wget -N 'https://github.com/vadz/lmi/raw/master/gwc/.vim/spell/en.utf-8.add'
+wget -N -nv 
'https://github.com/vadz/lmi/raw/master/gwc/.vim/spell/en.utf-8.add'
 mkdir ~/.vim/spell
 mv en.utf-8.add ~/.vim/spell/en.utf-8.add
 mkdir /home/${USER}/.vim/spell
@@ -131,7 +131,7 @@ git config --global push.default simple
 
 # Install lmi for wine.
 
-wget -N 'https://github.com/vadz/lmi/raw/master/install_msw.sh'
+wget -N -nv 'https://github.com/vadz/lmi/raw/master/install_msw.sh'
 chmod +x install_msw.sh
 ./install_msw.sh >log 2>&1
 
diff --git a/install_centos.sh b/install_centos.sh
index 2ea62e0..8188c01 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -152,16 +152,16 @@ set -vx
 
 echo "Adapted from 'lmi_setup_00.sh'."
 
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_10.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_11.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_20.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_21.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_30.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_40.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_41.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_42.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_43.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_inc.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_11.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_20.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_21.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_30.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_40.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_41.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_42.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_43.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_inc.sh
 chmod +x lmi_setup_*.sh
 
 . ./lmi_setup_inc.sh
diff --git a/install_redhat.sh b/install_redhat.sh
index ec0c3de..f6adbfc 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -112,17 +112,17 @@ mount --bind /srv/cache_for_lmi 
/srv/chroot/"${CHRTNAME}"/cache_for_lmi || echo
 mkdir -p /var/cache/"${CODENAME}"
 mount --bind /var/cache/"${CODENAME}" 
/srv/chroot/"${CHRTNAME}"/var/cache/apt/archives || echo "Oops."
 
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_10.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_11.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_20.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_21.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_30.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_40.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_41.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_42.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_43.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_11.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_20.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_21.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_30.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_40.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_41.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_42.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_43.sh
 # Don't download this--it will have been customized locally.
-#wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_inc.sh
+#wget -N -nv "${GIT_URL_BASE}"/lmi_setup_inc.sh
 chmod +x lmi_setup_*.sh
 
 . ./lmi_setup_inc.sh
diff --git a/lmi_setup_00.sh b/lmi_setup_00.sh
index 20b493d..dadd27b 100755
--- a/lmi_setup_00.sh
+++ b/lmi_setup_00.sh
@@ -31,16 +31,16 @@ assert_not_chrooted
 stamp0=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 echo "Started: $stamp0"
 
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_10.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_11.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_20.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_21.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_30.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_40.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_41.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_42.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_43.sh
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/lmi_setup_inc.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_11.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_20.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_21.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_30.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_40.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_41.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_42.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_43.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_inc.sh
 chmod +x lmi_setup_*.sh
 
 ./lmi_setup_10.sh
diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index 0d830da..3db1bd0 100755
--- a/lmi_setup_21.sh
+++ b/lmi_setup_21.sh
@@ -87,7 +87,7 @@ patch --dry-run --strip=0 --directory=/ 
</home/"${NORMAL_USER}"/ltmain.sh.patch
 
 # Configure zsh, for root as well as the user configured above.
 
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/gwc/.zshrc
+wget -N -nv "${GIT_URL_BASE}"/gwc/.zshrc
 mv .zshrc ~
 cp -a ~/.zshrc /home/"${NORMAL_USER}"/.zshrc
 chown "${NORMAL_USER}":"${NORMAL_GROUP}" /home/"${NORMAL_USER}"/.zshrc
@@ -96,7 +96,7 @@ chown "${NORMAL_USER}":"${NORMAL_GROUP}" 
/home/"${NORMAL_USER}"/.zshrc
 # '~/.vimrc' and '/etc/vim/vimrc.local', use '~/.vimrc' for all
 # customizations and copy that file for the normal user too.
 
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/gwc/.vimrc
+wget -N -nv "${GIT_URL_BASE}"/gwc/.vimrc
 mv .vimrc ~
 cp -a ~/.vimrc /home/"${NORMAL_USER}"/.vimrc
 chown "${NORMAL_USER}":"${NORMAL_GROUP}" /home/"${NORMAL_USER}"/.vimrc
@@ -107,7 +107,7 @@ mkdir ~/.vim
 mkdir /home/"${NORMAL_USER}"/.vim
 chown "${NORMAL_USER}":"${NORMAL_GROUP}" /home/"${NORMAL_USER}"/.vim
 # It's a much better idea to copy a mature spellfile hither:
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/gwc/.vim/spell/en.utf-8.add
+wget -N -nv "${GIT_URL_BASE}"/gwc/.vim/spell/en.utf-8.add
 mkdir ~/.vim/spell
 mv en.utf-8.add ~/.vim/spell/en.utf-8.add
 mkdir /home/"${NORMAL_USER}"/.vim/spell
diff --git a/lmi_setup_42.sh b/lmi_setup_42.sh
index 6cbf280..70b1e94 100755
--- a/lmi_setup_42.sh
+++ b/lmi_setup_42.sh
@@ -31,7 +31,7 @@ assert_chrooted
 # Install lmi for wine.
 
 cd ~ || { printf 'failed: cd\n'; exit 3; }
-wget "${WGETFLAGS}" "${GIT_URL_BASE}"/install_msw.sh
+wget -N -nv "${GIT_URL_BASE}"/install_msw.sh
 chmod +x install_msw.sh
 ./install_msw.sh >log 2>&1
 
diff --git a/lmi_setup_inc.sh b/lmi_setup_inc.sh
index 0685f10..bbd2196 100755
--- a/lmi_setup_inc.sh
+++ b/lmi_setup_inc.sh
@@ -30,8 +30,6 @@
 
 set -vx
 
-WGETFLAGS='--timestamping --no-verbose'
-
 CODENAME=bullseye
 CHRTVER=1
 CHRTNAME=lmi_${CODENAME}_${CHRTVER}