[lmi-commits] [lmi] master b773fc3e 1/2: Quote chroot name in scripts

lmi-commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master b773fc3e 1/2: Quote chroot name in scripts

From:	Greg Chicares
Subject:	[lmi-commits] [lmi] master b773fc3e 1/2: Quote chroot name in scripts
Date:	Mon, 21 Feb 2022 18:19:14 -0500 (EST)

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

    Quote chroot name in scripts
    
    This hadn't been done everywhere, but will presently be needed.
---
 lmi_setup_01.sh  | 20 ++++++++++----------
 lmi_setup_01c.sh | 20 ++++++++++----------
 lmi_setup_01r.sh | 22 +++++++++++-----------
 lmi_setup_30.sh  |  4 ++--
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/lmi_setup_01.sh b/lmi_setup_01.sh
index 0ac4be70..46094830 100755
--- a/lmi_setup_01.sh
+++ b/lmi_setup_01.sh
@@ -40,15 +40,15 @@ 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
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_24.sh
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_25.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_20.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_21.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_24.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_25.sh
 for user in $(echo "${CHROOT_USERS}" | tr ',' '\n'); do
 {
-schroot --chroot=${CHRTNAME} --user="${user}"        --directory=/tmp 
./lmi_setup_25.sh
+schroot --chroot="${CHRTNAME}" --user="${user}"        --directory=/tmp 
./lmi_setup_25.sh
 } done
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_29.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_29.sh
 # On a particular corporate server, root is not a sudoer.
 if sudo -l true; then
   sudo                       --user="${NORMAL_USER}"                  
./lmi_setup_30.sh
@@ -57,11 +57,11 @@ else
 fi
 for user in $(echo "${CHROOT_USERS}" | tr ',' '\n'); do
 {
-schroot --chroot=${CHRTNAME} --user="${user}"        --directory=/tmp 
./lmi_setup_40.sh
+schroot --chroot="${CHRTNAME}" --user="${user}"        --directory=/tmp 
./lmi_setup_40.sh
 } done
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_42.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_43.sh
-schroot --chroot=${CHRTNAME} --user=nemo             --directory=/tmp 
./lmi_setup_44.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
+schroot --chroot="${CHRTNAME}" --user=nemo             --directory=/tmp 
./lmi_setup_44.sh
 
 stamp=$(date -u +'%Y%m%dT%H%M%SZ')
 echo "$stamp $0 [debian host]"  | tee /dev/tty
diff --git a/lmi_setup_01c.sh b/lmi_setup_01c.sh
index bc52b9ed..d4460c90 100755
--- a/lmi_setup_01c.sh
+++ b/lmi_setup_01c.sh
@@ -49,15 +49,15 @@ 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
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_24.sh
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_25.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_20.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_21.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_24.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_25.sh
 for user in $(echo "${CHROOT_USERS}" | tr ',' '\n'); do
 {
-schroot --chroot=${CHRTNAME} --user="${user}"        --directory=/tmp 
./lmi_setup_25.sh
+schroot --chroot="${CHRTNAME}" --user="${user}"        --directory=/tmp 
./lmi_setup_25.sh
 } done
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_29.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_29.sh
 # On a particular corporate server, root is not a sudoer.
 if sudo -l true; then
   sudo                       --user="${NORMAL_USER}"                  
./lmi_setup_30.sh
@@ -66,11 +66,11 @@ else
 fi
 for user in $(echo "${CHROOT_USERS}" | tr ',' '\n'); do
 {
-schroot --chroot=${CHRTNAME} --user="${user}"        --directory=/tmp 
./lmi_setup_40.sh
+schroot --chroot="${CHRTNAME}" --user="${user}"        --directory=/tmp 
./lmi_setup_40.sh
 } done
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_42.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_43.sh
-schroot --chroot=${CHRTNAME} --user=nemo             --directory=/tmp 
./lmi_setup_44.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
+schroot --chroot="${CHRTNAME}" --user=nemo             --directory=/tmp 
./lmi_setup_44.sh
 
 stamp=$(date -u +'%Y%m%dT%H%M%SZ')
 echo "$stamp $0 [centos host]"  | tee /dev/tty
diff --git a/lmi_setup_01r.sh b/lmi_setup_01r.sh
index 6602d69d..d1b444db 100755
--- a/lmi_setup_01r.sh
+++ b/lmi_setup_01r.sh
@@ -43,15 +43,15 @@ 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
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_24.sh
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_25.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_20.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_21.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_24.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_25.sh
 for user in $(echo "${CHROOT_USERS}" | tr ',' '\n'); do
 {
-schroot --chroot=${CHRTNAME} --user="${user}"        --directory=/tmp 
./lmi_setup_25.sh || echo "Oops."
+schroot --chroot="${CHRTNAME}" --user="${user}"        --directory=/tmp 
./lmi_setup_25.sh || echo "Oops."
 } done
-schroot --chroot=${CHRTNAME} --user=root             --directory=/tmp 
./lmi_setup_29.sh
+schroot --chroot="${CHRTNAME}" --user=root             --directory=/tmp 
./lmi_setup_29.sh
 # On a particular corporate server, root is not a sudoer.
 if sudo -l true; then
   sudo                       --user="${NORMAL_USER}"                  
./lmi_setup_30.sh
@@ -60,16 +60,16 @@ else
 fi
 for user in $(echo "${CHROOT_USERS}" | tr ',' '\n'); do
 {
-schroot --chroot=${CHRTNAME} --user="${user}"        --directory=/tmp 
./lmi_setup_40.sh || echo "Oops."
+schroot --chroot="${CHRTNAME}" --user="${user}"        --directory=/tmp 
./lmi_setup_40.sh || echo "Oops."
 } done
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_42.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_43.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
 # Ideally, this test would be run as a different user, but the 'nemo'
 # account created for that purpose stopped working on a corporate
 # redhat server--see:
 #   https://lists.nongnu.org/archive/html/lmi/2020-10/msg00058.html
-# schroot --chroot=${CHRTNAME} --user=nemo             --directory=/tmp 
./lmi_setup_44.sh
-schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_44.sh
+# schroot --chroot="${CHRTNAME}" --user=nemo             --directory=/tmp 
./lmi_setup_44.sh
+schroot --chroot="${CHRTNAME}" --user="${NORMAL_USER}" --directory=/tmp 
./lmi_setup_44.sh
 
 stamp=$(date -u +'%Y%m%dT%H%M%SZ')
 echo "$stamp $0 [redhat host]"  | tee /dev/tty
diff --git a/lmi_setup_30.sh b/lmi_setup_30.sh
index 1916d7b6..1b929da6 100755
--- a/lmi_setup_30.sh
+++ b/lmi_setup_30.sh
@@ -57,7 +57,7 @@ assert_not_chrooted
 # created by these scripts (which mount that directory).
 
 # Also copy any desired msw software into the chroot now, e.g.:
-#   cp -a /srv/chroot/some-prior-chroot/opt/xyzzy 
/srv/chroot/${CHRTNAME}/opt/xyzzy
+#   cp -a /srv/chroot/some-prior-chroot/opt/xyzzy 
/srv/chroot/"${CHRTNAME}"/opt/xyzzy
 # unless it requires running an "install" program, which must be
 # postponed until wine has been installed (in a later script). For
 # example, to copy all software installed in subdirectories of /opt/
@@ -68,7 +68,7 @@ assert_not_chrooted
 
 # Configure ssh, iff this chroot needs write access to savannah.
 # The easiest way is to copy existing credentials, e.g.:
-cp -a ~/.ssh/ /srv/chroot/${CHRTNAME}/home/"${NORMAL_USER}" || true
+cp -a ~/.ssh/ /srv/chroot/"${CHRTNAME}"/home/"${NORMAL_USER}" || true
 # Make sure the .ssh/config file contains:
 #   Protocol 2
 #   HashKnownHosts no

[Prev in Thread]

Current Thread

[Next in Thread]

[lmi-commits] [lmi] master updated (6414123d -> ef4aeec6), Greg Chicares, 2022/02/21
- [lmi-commits] [lmi] master ef4aeec6 2/2: Uniquify chroot version, using an optional global variable, Greg Chicares, 2022/02/21
- [lmi-commits] [lmi] master b773fc3e 1/2: Quote chroot name in scripts, Greg Chicares <=

Prev by Date: [lmi-commits] [lmi] master updated (6414123d -> ef4aeec6)
Next by Date: [lmi-commits] [lmi] master c22781b2 2/2: Uniquify chroot version
Previous by thread: [lmi-commits] [lmi] master ef4aeec6 2/2: Uniquify chroot version, using an optional global variable
Next by thread: [lmi-commits] [lmi] master updated (ef4aeec6 -> c22781b2)
Index(es):
- Date
- Thread