[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 42a0085 2/2: Make wget less verbose
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 42a0085 2/2: Make wget less verbose |
|
Date: |
Mon, 17 Feb 2020 08:49:40 -0500 (EST) |
branch: master
commit 42a0085833a0be1ae931d325d997e4bc03384709
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Make wget less verbose
Decreasing verbosity makes logs easier to compare.
---
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 ++
6 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/install_centos.sh b/install_centos.sh
index ab74f32..2ea62e0 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -152,16 +152,16 @@ set -vx
echo "Adapted from 'lmi_setup_00.sh'."
-wget -N "${GIT_URL_BASE}"/lmi_setup_10.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_11.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_20.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_21.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_30.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_40.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_41.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_42.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_43.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_inc.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
chmod +x lmi_setup_*.sh
. ./lmi_setup_inc.sh
diff --git a/install_redhat.sh b/install_redhat.sh
index 86c3d12..ec0c3de 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 -N "${GIT_URL_BASE}"/lmi_setup_10.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_11.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_20.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_21.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_30.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_40.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_41.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_42.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_43.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
# Don't download this--it will have been customized locally.
-#wget -N "${GIT_URL_BASE}"/lmi_setup_inc.sh
+#wget "${WGETFLAGS}" "${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 2d44b46..20b493d 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 -N "${GIT_URL_BASE}"/lmi_setup_10.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_11.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_20.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_21.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_30.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_40.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_41.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_42.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_43.sh
-wget -N "${GIT_URL_BASE}"/lmi_setup_inc.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
chmod +x lmi_setup_*.sh
./lmi_setup_10.sh
diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index 9c8cc98..0d830da 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 -N "${GIT_URL_BASE}"/gwc/.zshrc
+wget "${WGETFLAGS}" "${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 -N "${GIT_URL_BASE}"/gwc/.vimrc
+wget "${WGETFLAGS}" "${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 -N "${GIT_URL_BASE}"/gwc/.vim/spell/en.utf-8.add
+wget "${WGETFLAGS}" "${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 628f46d..6cbf280 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 -N "${GIT_URL_BASE}"/install_msw.sh
+wget "${WGETFLAGS}" "${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 bbd2196..961cb63 100755
--- a/lmi_setup_inc.sh
+++ b/lmi_setup_inc.sh
@@ -30,6 +30,8 @@
set -vx
+WGETFLAGS='--timestamping --no-verbose --show-progress'
+
CODENAME=bullseye
CHRTVER=1
CHRTNAME=lmi_${CODENAME}_${CHRTVER}