[lmi-commits] [lmi] master 9289c8d 1/2: Call wget in top-level script only

[Greg Chicares]

branch: master
commit 9289c8dd741aa4aeb88ba2b800298336e6d5f816
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Call wget in top-level script only
    
    If wget fails, it's better for it to fail early in an hour-long process.
---
 lmi_setup_00.sh  | 5 +++++
 lmi_setup_00c.sh | 4 ++++
 lmi_setup_01.sh  | 8 +++++++-
 lmi_setup_01c.sh | 8 +++++++-
 lmi_setup_01r.sh | 8 +++++++-
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/lmi_setup_00.sh b/lmi_setup_00.sh
index b25513f..5d1c31b 100755
--- a/lmi_setup_00.sh
+++ b/lmi_setup_00.sh
@@ -63,6 +63,11 @@ set +v
 EOF
 chmod 0666 /tmp/schroot_env
 
+wget -N -nv "${GIT_URL_BASE}"/gwc/.zshrc
+wget -N -nv "${GIT_URL_BASE}"/gwc/.vimrc
+wget -N -nv "${GIT_URL_BASE}"/gwc/.vim/spell/en.utf-8.add
+wget -N -nv "${GIT_URL_BASE}"/install_msw.sh
+chmod 0777 install_msw.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_00c.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_01.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_01c.sh
diff --git a/lmi_setup_00c.sh b/lmi_setup_00c.sh
index 4cd81fd..6a2d3f6 100755
--- a/lmi_setup_00c.sh
+++ b/lmi_setup_00c.sh
@@ -57,6 +57,10 @@ echo Installed centos chroot.
 
 cp -a /tmp/schroot_env /srv/chroot/centos7lmi/tmp
 cp -a lmi_setup_*.sh   /srv/chroot/centos7lmi/tmp
+cp -a .zshrc           /srv/chroot/centos7lmi/tmp
+cp -a .vimrc           /srv/chroot/centos7lmi/tmp
+cp -a en.utf-8.add     /srv/chroot/centos7lmi/tmp
+cp -a install_msw.sh   /srv/chroot/centos7lmi/tmp
 
 # BEGIN ./lmi_setup_13.sh
 CACHEDIR=/var/cache/"${CODENAME}"
diff --git a/lmi_setup_01.sh b/lmi_setup_01.sh
index 33e44c1..77f7476 100755
--- a/lmi_setup_01.sh
+++ b/lmi_setup_01.sh
@@ -41,7 +41,13 @@ mkdir -p /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 mount --bind /srv/cache_for_lmi /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 # END   ./lmi_setup_13.sh
 
-cp -a lmi_setup_*.sh /tmp/schroot_env /srv/chroot/${CHRTNAME}/tmp
+cp -a /tmp/schroot_env /srv/chroot/"${CHRTNAME}"/tmp
+cp -a lmi_setup_*.sh   /srv/chroot/"${CHRTNAME}"/tmp
+cp -a .zshrc           /srv/chroot/"${CHRTNAME}"/tmp
+cp -a .vimrc           /srv/chroot/"${CHRTNAME}"/tmp
+cp -a en.utf-8.add     /srv/chroot/"${CHRTNAME}"/tmp
+cp -a install_msw.sh   /srv/chroot/"${CHRTNAME}"/tmp
+
 schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_20.sh
 schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_21.sh
 # On a particular corporate server, root is not a sudoer.
diff --git a/lmi_setup_01c.sh b/lmi_setup_01c.sh
index 4ec7429..39bd121 100755
--- a/lmi_setup_01c.sh
+++ b/lmi_setup_01c.sh
@@ -79,7 +79,13 @@ mkdir -p /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 mount --bind /srv/cache_for_lmi /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 # END   ./lmi_setup_13.sh
 
-cp -a lmi_setup_*.sh /tmp/schroot_env /srv/chroot/${CHRTNAME}/tmp
+cp -a /tmp/schroot_env /srv/chroot/"${CHRTNAME}"/tmp
+cp -a lmi_setup_*.sh   /srv/chroot/"${CHRTNAME}"/tmp
+cp -a .zshrc           /srv/chroot/"${CHRTNAME}"/tmp
+cp -a .vimrc           /srv/chroot/"${CHRTNAME}"/tmp
+cp -a en.utf-8.add     /srv/chroot/"${CHRTNAME}"/tmp
+cp -a install_msw.sh   /srv/chroot/"${CHRTNAME}"/tmp
+
 schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_20.sh
 schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_21.sh
 # On a particular corporate server, root is not a sudoer.
diff --git a/lmi_setup_01r.sh b/lmi_setup_01r.sh
index 28e1bb0..b9503e5 100755
--- a/lmi_setup_01r.sh
+++ b/lmi_setup_01r.sh
@@ -44,7 +44,13 @@ mkdir -p /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 mount --bind /srv/cache_for_lmi /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi
 # END   ./lmi_setup_13.sh
 
-cp -a lmi_setup_*.sh /tmp/schroot_env /srv/chroot/${CHRTNAME}/tmp
+cp -a /tmp/schroot_env /srv/chroot/"${CHRTNAME}"/tmp
+cp -a lmi_setup_*.sh   /srv/chroot/"${CHRTNAME}"/tmp
+cp -a .zshrc           /srv/chroot/"${CHRTNAME}"/tmp
+cp -a .vimrc           /srv/chroot/"${CHRTNAME}"/tmp
+cp -a en.utf-8.add     /srv/chroot/"${CHRTNAME}"/tmp
+cp -a install_msw.sh   /srv/chroot/"${CHRTNAME}"/tmp
+
 schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_20.sh
 schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_21.sh
 # On a particular corporate server, root is not a sudoer.