[lmi-commits] [lmi] master ecbd9d5 1/3: Extract marked blocks into sub-scripts #13

[Greg Chicares]

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

    Extract marked blocks into sub-scripts #13
---
 lmi_setup_00c.sh                     | 12 +---------
 lmi_setup_01.sh                      | 10 +--------
 lmi_setup_01c.sh                     | 10 +--------
 lmi_setup_01r.sh                     | 10 +--------
 lmi_setup_01.sh => lmi_setup_13.sh   | 29 ++----------------------
 lmi_setup_00c.sh => lmi_setup_13c.sh | 43 +++---------------------------------
 6 files changed, 9 insertions(+), 105 deletions(-)

diff --git a/lmi_setup_00c.sh b/lmi_setup_00c.sh
index cc80d7d..e1f0374 100755
--- a/lmi_setup_00c.sh
+++ b/lmi_setup_00c.sh
@@ -62,17 +62,7 @@ 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}"
-mkdir -p "${CACHEDIR}"
-mkdir -p /srv/chroot/centos7lmi/"${CACHEDIR}"
-mount --bind "${CACHEDIR}" /srv/chroot/centos7lmi/"${CACHEDIR}"
-
-mkdir -p /srv/cache_for_lmi
-du   -sb /srv/chroot/centos7lmi/srv/cache_for_lmi || echo "Okay."
-mkdir -p /srv/chroot/centos7lmi/srv/cache_for_lmi
-mount --bind /srv/cache_for_lmi /srv/chroot/centos7lmi/srv/cache_for_lmi
-# END   ./lmi_setup_13.sh
+./lmi_setup_13c.sh
 
 schroot --chroot=centos7lmi --user=root --directory=/tmp ./lmi_setup_01c.sh
 
diff --git a/lmi_setup_01.sh b/lmi_setup_01.sh
index 7f15072..91a3dcb 100755
--- a/lmi_setup_01.sh
+++ b/lmi_setup_01.sh
@@ -31,15 +31,7 @@ assert_not_chrooted
 
 ./lmi_setup_10.sh
 ./lmi_setup_11.sh
-
-# BEGIN ./lmi_setup_13.sh
-# For caveats, see:
-#    https://lists.nongnu.org/archive/html/lmi/2020-05/msg00040.html
-mkdir -p /srv/cache_for_lmi
-du   -sb /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi || echo "Okay."
-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
+./lmi_setup_13.sh
 
 cp -a /tmp/schroot_env /srv/chroot/"${CHRTNAME}"/tmp
 cp -a lmi_setup_*.sh   /srv/chroot/"${CHRTNAME}"/tmp
diff --git a/lmi_setup_01c.sh b/lmi_setup_01c.sh
index 70ce763..3097599 100755
--- a/lmi_setup_01c.sh
+++ b/lmi_setup_01c.sh
@@ -66,15 +66,7 @@ vim -es -c ':mkspell! ~/.vim/spell/en.utf-8.add' -c ':q'
 
 ./lmi_setup_10r.sh
 ./lmi_setup_11.sh
-
-# BEGIN ./lmi_setup_13.sh
-# For caveats, see:
-#    https://lists.nongnu.org/archive/html/lmi/2020-05/msg00040.html
-mkdir -p /srv/cache_for_lmi
-du   -sb /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi || echo "Okay."
-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
+./lmi_setup_13.sh
 
 cp -a /tmp/schroot_env /srv/chroot/"${CHRTNAME}"/tmp
 cp -a lmi_setup_*.sh   /srv/chroot/"${CHRTNAME}"/tmp
diff --git a/lmi_setup_01r.sh b/lmi_setup_01r.sh
index 48648a9..80d1821 100755
--- a/lmi_setup_01r.sh
+++ b/lmi_setup_01r.sh
@@ -34,15 +34,7 @@ assert_not_chrooted
 ./lmi_setup_07r.sh
 ./lmi_setup_10r.sh
 ./lmi_setup_11.sh
-
-# BEGIN ./lmi_setup_13.sh
-# For caveats, see:
-#    https://lists.nongnu.org/archive/html/lmi/2020-05/msg00040.html
-mkdir -p /srv/cache_for_lmi
-du   -sb /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi || echo "Okay."
-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
+./lmi_setup_13.sh
 
 cp -a /tmp/schroot_env /srv/chroot/"${CHRTNAME}"/tmp
 cp -a lmi_setup_*.sh   /srv/chroot/"${CHRTNAME}"/tmp
diff --git a/lmi_setup_01.sh b/lmi_setup_13.sh
similarity index 51%
copy from lmi_setup_01.sh
copy to lmi_setup_13.sh
index 7f15072..fdacd91 100755
--- a/lmi_setup_01.sh
+++ b/lmi_setup_13.sh
@@ -24,42 +24,17 @@
 . ./lmi_setup_inc.sh
 . /tmp/schroot_env
 
-set -evx
+set -vx
 
 assert_su
 assert_not_chrooted
 
-./lmi_setup_10.sh
-./lmi_setup_11.sh
-
-# BEGIN ./lmi_setup_13.sh
 # For caveats, see:
 #    https://lists.nongnu.org/archive/html/lmi/2020-05/msg00040.html
 mkdir -p /srv/cache_for_lmi
 du   -sb /srv/chroot/"${CHRTNAME}"/srv/cache_for_lmi || echo "Okay."
 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 /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.
-if sudo -l true; then
-  sudo                       --user="${NORMAL_USER}"                  
./lmi_setup_30.sh
-else
-  su                                "${NORMAL_USER}"                  
./lmi_setup_30.sh
-fi
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_40.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_41.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_42.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_43.sh
 
 stamp=$(date -u +'%Y%m%dT%H%M%SZ')
-echo "$stamp $0 [debian host]"  | tee /dev/tty
+echo "$stamp $0: Mounted cache_for_lmi."  | tee /dev/tty
diff --git a/lmi_setup_00c.sh b/lmi_setup_13c.sh
similarity index 52%
copy from lmi_setup_00c.sh
copy to lmi_setup_13c.sh
index cc80d7d..85bc9c7 100755
--- a/lmi_setup_00c.sh
+++ b/lmi_setup_13c.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Create a chroot for cross-building "Let me illustrate..." on centos-7.
+# Create a chroot for cross-building "Let me illustrate...".
 #
 # Copyright (C) 2016, 2017, 2018, 2019, 2020 Gregory W. Chicares.
 #
@@ -24,45 +24,11 @@
 . ./lmi_setup_inc.sh
 . /tmp/schroot_env
 
-set -evx
+set -vx
 
 assert_su
 assert_not_chrooted
 
-./lmi_setup_02c.sh
-
-cat >/etc/schroot/chroot.d/centos7lmi.conf <<EOF
-[centos7lmi]
-description=centos-7.7
-directory=/srv/chroot/centos7lmi
-users=${CHROOT_USERS}
-groups=${NORMAL_GROUP}
-root-groups=root
-shell=/bin/zsh
-type=plain
-EOF
-
-./lmi_setup_10c.sh
-
-rinse --arch amd64 --distribution centos-7 \
-  --directory /srv/chroot/centos7lmi \
-
-mkdir -p /var/cache/centos_lmi
-# There are probably a few directories here, with no regular files.
-du   -sb /srv/chroot/centos7lmi/var/cache/yum || echo "Oops: rinse didn't 
create cache"
-mkdir -p /srv/chroot/centos7lmi/var/cache/yum
-mount --bind /var/cache/centos_lmi /srv/chroot/centos7lmi/var/cache/yum
-
-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}"
 mkdir -p "${CACHEDIR}"
 mkdir -p /srv/chroot/centos7lmi/"${CACHEDIR}"
@@ -72,9 +38,6 @@ mkdir -p /srv/cache_for_lmi
 du   -sb /srv/chroot/centos7lmi/srv/cache_for_lmi || echo "Okay."
 mkdir -p /srv/chroot/centos7lmi/srv/cache_for_lmi
 mount --bind /srv/cache_for_lmi /srv/chroot/centos7lmi/srv/cache_for_lmi
-# END   ./lmi_setup_13.sh
-
-schroot --chroot=centos7lmi --user=root --directory=/tmp ./lmi_setup_01c.sh
 
 stamp=$(date -u +'%Y%m%dT%H%M%SZ')
-echo "$stamp $0 Installed in centos chroot."  | tee /dev/tty
+echo "$stamp $0: Mounted cache_for_lmi [centos]."  | tee /dev/tty