[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 5b452d6 03/10: Rearrange some independent scr
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 5b452d6 03/10: Rearrange some independent script blocks |
|
Date: |
Thu, 28 May 2020 20:34:09 -0400 (EDT) |
branch: master
commit 5b452d6770c3667f57c25e98f2508c2a6c06ad93
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Rearrange some independent script blocks
---
install_centos.sh | 50 +++++++++++++++++++++++++-------------------------
install_redhat.sh | 44 ++++++++++++++++++++++----------------------
lmi_setup_00.sh | 38 +++++++++++++++++++-------------------
3 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/install_centos.sh b/install_centos.sh
index ce39a91..9812762 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -34,31 +34,6 @@ else
GIT_URL_BASE=https://github.com/vadz/lmi/raw/master
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_10c.sh
-wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10r.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
-wget -N -nv "${GIT_URL_BASE}"/install_centos_1.sh
-chmod 0777 lmi_setup_*.sh
-chmod 0777 install_centos_*.sh
-
-. ./lmi_setup_inc.sh
-
-set -evx
-
-assert_su
-assert_not_chrooted
-
# Store dynamic configuration in a temporary file. This method is
# simple and robust, and far better than trying to pass environment
# variables across sudo and schroot barriers.
@@ -88,6 +63,31 @@ set +v
EOF
chmod 0666 /tmp/schroot_env
+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_10c.sh
+wget -N -nv "${GIT_URL_BASE}"/lmi_setup_10r.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
+wget -N -nv "${GIT_URL_BASE}"/install_centos_1.sh
+chmod 0777 lmi_setup_*.sh
+chmod 0777 install_centos_*.sh
+
+. ./lmi_setup_inc.sh
+
+set -evx
+
+assert_su
+assert_not_chrooted
+
./lmi_setup_02c.sh
set -evx
diff --git a/install_redhat.sh b/install_redhat.sh
index 51ad32d..8fed940 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -34,28 +34,6 @@ else
GIT_URL_BASE=https://github.com/vadz/lmi/raw/master
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_10r.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 0777 lmi_setup_*.sh
-
-. ./lmi_setup_inc.sh
-
-set -evx
-
-assert_su
-assert_not_chrooted
-
# Store dynamic configuration in a temporary file. This method is
# simple and robust, and far better than trying to pass environment
# variables across sudo and schroot barriers.
@@ -85,6 +63,28 @@ set +v
EOF
chmod 0666 /tmp/schroot_env
+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_10r.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 0777 lmi_setup_*.sh
+
+. ./lmi_setup_inc.sh
+
+set -evx
+
+assert_su
+assert_not_chrooted
+
./lmi_setup_02.sh
./lmi_setup_05r.sh
./lmi_setup_07r.sh
diff --git a/lmi_setup_00.sh b/lmi_setup_00.sh
index 35fd4ce..7065c80 100755
--- a/lmi_setup_00.sh
+++ b/lmi_setup_00.sh
@@ -34,25 +34,6 @@ else
GIT_URL_BASE=https://github.com/vadz/lmi/raw/master
fi
-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 0777 lmi_setup_*.sh
-
-. ./lmi_setup_inc.sh
-
-set -evx
-
-assert_su
-assert_not_chrooted
-
# Store dynamic configuration in a temporary file. This method is
# simple and robust, and far better than trying to pass environment
# variables across sudo and schroot barriers.
@@ -82,6 +63,25 @@ set +v
EOF
chmod 0666 /tmp/schroot_env
+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 0777 lmi_setup_*.sh
+
+. ./lmi_setup_inc.sh
+
+set -evx
+
+assert_su
+assert_not_chrooted
+
./lmi_setup_10.sh
./lmi_setup_11.sh
cp -a lmi_setup_*.sh /tmp/schroot_env /srv/chroot/${CHRTNAME}/tmp
- [lmi-commits] [lmi] master updated (9ed6f1d -> 565e243), Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master bfd0cf7 01/10: Use --bind when --rbind is unnecessary, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master 47295e3 04/10: Reduce gratuitous differences between scripts, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master 6d1ca69 05/10: Rename a script, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master 2566530 02/10: Improve documentation, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master 565e243 10/10: Write log files elsewhere, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master 5a6c188 07/10: Extract blocks into sub-scripts #01, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master a13e9f6 08/10: Extract block into sub-script #00 centos, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master b290253 09/10: Expunge a redundant line, Greg Chicares, 2020/05/28
- [lmi-commits] [lmi] master 5b452d6 03/10: Rearrange some independent script blocks,
Greg Chicares <=
- [lmi-commits] [lmi] master 7482438 06/10: Always wget all lmi_setup_*, Greg Chicares, 2020/05/28