[lmi-commits] [lmi] master 71eeb9b 9/9: Extract marked blocks into sub-scripts #07

[Greg Chicares]

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

    Extract marked blocks into sub-scripts #07
---
 install_centos.sh                       |  1 +
 install_centos_1.sh                     | 28 +---------------------------
 install_redhat.sh                       | 29 ++---------------------------
 install_centos_1.sh => lmi_setup_07r.sh | 23 ++---------------------
 4 files changed, 6 insertions(+), 75 deletions(-)

diff --git a/install_centos.sh b/install_centos.sh
index e4c5eb5..d5c9d34 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -36,6 +36,7 @@ fi
 
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_02c.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_05c.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_07r.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
diff --git a/install_centos_1.sh b/install_centos_1.sh
index 8697d94..f37efab 100755
--- a/install_centos_1.sh
+++ b/install_centos_1.sh
@@ -31,33 +31,7 @@ assert_not_chrooted
 
 ./lmi_setup_05c.sh
 
-# BEGIN ./lmi_setup_07.sh
-# Suppress a nuisance: rh-based distributions provide a default
-# zsh logout file that clears the screen.
-sed -e'/^[^#]/s/^/# SUPPRESSED # /' -i /etc/zlogout
-
-# Make a more modern 'git' available via 'scl'. This is not needed
-# if all real work is done in a debian chroot.
-#yum --assumeyes install centos-release-scl
-#yum-config-manager --enable rhel-server-rhscl-7-rpms
-#yum --assumeyes install devtoolset-8 rh-git218
-# In order to use the tools on the three preceding lines, do:
-#   scl enable devtoolset-8 rh-git218 $SHELL
-# and then they'll be available in that environment.
-
-# Fix weird errors like "Problem with the SSL CA cert (path? access rights?)".
-# Try 'update' before 'install' as described here:
-#   https://lists.nongnu.org/archive/html/lmi/2020-02/msg00003.html
-yum --assumeyes update ca-certificates curl nss-pem
-yum --assumeyes install ca-certificates curl nss-pem
-
-# Install "EPEL" by using 'rpm' directly [historical]. See:
-#   https://lists.nongnu.org/archive/html/lmi/2019-09/msg00037.html
-#rpm -ivh 
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-# Instead, use 'yum' to install "EPEL".
-#yum --assumeyes install 
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-yum --assumeyes install epel-release
-# END   ./lmi_setup_07.sh
+./lmi_setup_07r.sh
 
 # BEGIN ./lmi_setup_10.sh
 yum --assumeyes install schroot
diff --git a/install_redhat.sh b/install_redhat.sh
index a4c5b6f..1608307 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -36,6 +36,7 @@ fi
 
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_02.sh
 wget -N -nv "${GIT_URL_BASE}"/lmi_setup_05r.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_07r.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
@@ -95,33 +96,7 @@ mkdir -p /srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
 mount --bind /var/cache/"${CODENAME}" 
/srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
 # END   ./lmi_setup_11.sh
 
-# BEGIN ./lmi_setup_07.sh
-# Suppress a nuisance: rh-based distributions provide a default
-# zsh logout file that clears the screen.
-sed -e'/^[^#]/s/^/# SUPPRESSED # /' -i /etc/zlogout
-
-# Make a more modern 'git' available via 'scl'. This is not needed
-# if all real work is done in a debian chroot.
-#yum --assumeyes install centos-release-scl
-#yum-config-manager --enable rhel-server-rhscl-7-rpms
-#yum --assumeyes install devtoolset-8 rh-git218
-# In order to use the tools on the three preceding lines, do:
-#   scl enable devtoolset-8 rh-git218 $SHELL
-# and then they'll be available in that environment.
-
-# Fix weird errors like "Problem with the SSL CA cert (path? access rights?)".
-# Try 'update' before 'install' as described here:
-#   https://lists.nongnu.org/archive/html/lmi/2020-02/msg00003.html
-yum --assumeyes update ca-certificates curl nss-pem
-yum --assumeyes install ca-certificates curl nss-pem
-
-# Install "EPEL" by using 'rpm' directly [historical]. See:
-#   https://lists.nongnu.org/archive/html/lmi/2019-09/msg00037.html
-#rpm -ivh 
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-# Instead, use 'yum' to install "EPEL".
-#yum --assumeyes install 
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-yum --assumeyes install epel-release
-# END   ./lmi_setup_07.sh
+./lmi_setup_07r.sh
 
 # BEGIN ./lmi_setup_10.sh
 yum --assumeyes install schroot
diff --git a/install_centos_1.sh b/lmi_setup_07r.sh
similarity index 78%
copy from install_centos_1.sh
copy to lmi_setup_07r.sh
index 8697d94..70257f8 100755
--- a/install_centos_1.sh
+++ b/lmi_setup_07r.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,14 +24,11 @@
 . ./lmi_setup_inc.sh
 . /tmp/schroot_env
 
-set -evx
+set -vx
 
 assert_su
 assert_not_chrooted
 
-./lmi_setup_05c.sh
-
-# BEGIN ./lmi_setup_07.sh
 # Suppress a nuisance: rh-based distributions provide a default
 # zsh logout file that clears the screen.
 sed -e'/^[^#]/s/^/# SUPPRESSED # /' -i /etc/zlogout
@@ -57,19 +54,3 @@ yum --assumeyes install ca-certificates curl nss-pem
 # Instead, use 'yum' to install "EPEL".
 #yum --assumeyes install 
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 yum --assumeyes install epel-release
-# END   ./lmi_setup_07.sh
-
-# BEGIN ./lmi_setup_10.sh
-yum --assumeyes install schroot
-# To show available debootstrap scripts:
-#   ls /usr/share/debootstrap/scripts
-# END   ./lmi_setup_10.sh
-
-# BEGIN ./lmi_setup_11.sh
-# Install a debian chroot inside this centos chroot.
-yum --assumeyes install debootstrap
-mkdir -p /srv/chroot/"${CHRTNAME}"
-debootstrap "${CODENAME}" /srv/chroot/"${CHRTNAME}" 
http://deb.debian.org/debian/
-
-echo Installed debian "${CODENAME}".
-# END   ./lmi_setup_11.sh