[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master f795947 1/3: Echo a message to /dev/tty at en
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master f795947 1/3: Echo a message to /dev/tty at end of each lmi_setup script |
Date: |
Tue, 2 Jun 2020 17:13:11 -0400 (EDT) |
branch: master
commit f795947cf2ae82323cb1162d9b591513dd2cdadb
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Echo a message to /dev/tty at end of each lmi_setup script
Provided minimalistic indications of progress on /dev/tty even when
normal output is redirected.
---
lmi_setup_00.sh | 5 +++--
lmi_setup_00c.sh | 3 +++
lmi_setup_01.sh | 3 +++
lmi_setup_01c.sh | 3 +++
lmi_setup_01r.sh | 3 +++
lmi_setup_02.sh | 3 +++
lmi_setup_02c.sh | 3 +++
lmi_setup_05c.sh | 3 +++
lmi_setup_05r.sh | 3 +++
lmi_setup_07r.sh | 3 +++
lmi_setup_10.sh | 3 +++
lmi_setup_10c.sh | 3 +++
lmi_setup_10r.sh | 3 +++
lmi_setup_11.sh | 3 ++-
lmi_setup_20.sh | 3 +++
lmi_setup_21.sh | 3 +++
lmi_setup_30.sh | 3 +++
lmi_setup_40.sh | 3 +++
lmi_setup_41.sh | 3 +++
lmi_setup_42.sh | 3 +++
lmi_setup_43.sh | 3 +++
21 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/lmi_setup_00.sh b/lmi_setup_00.sh
index 5d1c31b..e9b44d2 100755
--- a/lmi_setup_00.sh
+++ b/lmi_setup_00.sh
@@ -157,6 +157,7 @@ echo "Finished: $stamp1"
seconds=$(($(date -u '+%s' -d "$stamp1") - $(date -u '+%s' -d "$stamp0")))
elapsed=$(date -u -d @"$seconds" +'%H:%M:%S')
-echo "Elapsed: $elapsed"
-echo Finished creating debian chroot. >/dev/tty
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0 Installed and tested lmi." | tee /dev/tty
+echo "Elapsed: $elapsed; log suffix: $fstamp" | tee /dev/tty
diff --git a/lmi_setup_00c.sh b/lmi_setup_00c.sh
index 6a2d3f6..cc80d7d 100755
--- a/lmi_setup_00c.sh
+++ b/lmi_setup_00c.sh
@@ -75,3 +75,6 @@ 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
diff --git a/lmi_setup_01.sh b/lmi_setup_01.sh
index 77f7476..7f15072 100755
--- a/lmi_setup_01.sh
+++ b/lmi_setup_01.sh
@@ -60,3 +60,6 @@ schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}"
--directory=/tmp ./lmi_setu
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
diff --git a/lmi_setup_01c.sh b/lmi_setup_01c.sh
index 3888d5a..70ce763 100755
--- a/lmi_setup_01c.sh
+++ b/lmi_setup_01c.sh
@@ -95,3 +95,6 @@ schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}"
--directory=/tmp ./lmi_setu
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 [centos host]" | tee /dev/tty
diff --git a/lmi_setup_01r.sh b/lmi_setup_01r.sh
index b9503e5..48648a9 100755
--- a/lmi_setup_01r.sh
+++ b/lmi_setup_01r.sh
@@ -63,3 +63,6 @@ schroot --chroot=${CHRTNAME} --user="${NORMAL_USER}"
--directory=/tmp ./lmi_setu
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 [redhat host]" | tee /dev/tty
diff --git a/lmi_setup_02.sh b/lmi_setup_02.sh
index df856ac..e8d849d 100755
--- a/lmi_setup_02.sh
+++ b/lmi_setup_02.sh
@@ -93,3 +93,6 @@ rm --one-file-system --recursive --force \
rm /etc/schroot/chroot.d/"${CHRTNAME}".conf
# These commands fail harmlessly if the chroot doesn't already exist.
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Removed old chroot." | tee /dev/tty
diff --git a/lmi_setup_02c.sh b/lmi_setup_02c.sh
index 924ad0c..bca1533 100755
--- a/lmi_setup_02c.sh
+++ b/lmi_setup_02c.sh
@@ -46,3 +46,6 @@ fi
grep centos /proc/mounts | cut -f2 -d" " | xargs --no-run-if-empty umount
rm -rf /srv/chroot/centos7lmi
rm /etc/schroot/chroot.d/centos7lmi.conf
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Removed old centos chroot." | tee /dev/tty
diff --git a/lmi_setup_05c.sh b/lmi_setup_05c.sh
index dbeda88..8a94bdc 100755
--- a/lmi_setup_05c.sh
+++ b/lmi_setup_05c.sh
@@ -67,3 +67,6 @@ usermod -aG wheel "${NORMAL_USER}"
chsh -s /bin/zsh root
chsh -s /bin/zsh "${NORMAL_USER}"
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Reconfigured centos chroot." | tee /dev/tty
diff --git a/lmi_setup_05r.sh b/lmi_setup_05r.sh
index 540125c..ba02eb4 100755
--- a/lmi_setup_05r.sh
+++ b/lmi_setup_05r.sh
@@ -56,3 +56,6 @@ umount /srv/chroot
# Here, explicitly remount /srv/chroot because it was umounted above:
mount LABEL=lmi /srv/chroot
findmnt /srv/chroot
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Reconfigured redhat chroot." | tee /dev/tty
diff --git a/lmi_setup_07r.sh b/lmi_setup_07r.sh
index 58f382b..2983ff1 100755
--- a/lmi_setup_07r.sh
+++ b/lmi_setup_07r.sh
@@ -55,3 +55,6 @@ yum --assumeyes install ca-certificates curl nss-pem wget
# are required to install 'debootstrap' and 'schroot' later on RHEL:
yum --assumeyes install
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
yum --assumeyes install epel-release
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Installed EPEL." | tee /dev/tty
diff --git a/lmi_setup_10.sh b/lmi_setup_10.sh
index 453f863..ddfcd37 100755
--- a/lmi_setup_10.sh
+++ b/lmi_setup_10.sh
@@ -34,3 +34,6 @@ apt-get --assume-yes install debootstrap schroot
# To show available debootstrap scripts:
# ls /usr/share/debootstrap/scripts
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Installed 'debootstrap' [debian]." | tee /dev/tty
diff --git a/lmi_setup_10c.sh b/lmi_setup_10c.sh
index 6db97c2..c395602 100755
--- a/lmi_setup_10c.sh
+++ b/lmi_setup_10c.sh
@@ -31,3 +31,6 @@ assert_not_chrooted
apt-get update
apt-get --assume-yes install rinse schroot
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Installed 'rinse' [centos]." | tee /dev/tty
diff --git a/lmi_setup_10r.sh b/lmi_setup_10r.sh
index 7e02d17..0b5bb64 100755
--- a/lmi_setup_10r.sh
+++ b/lmi_setup_10r.sh
@@ -33,3 +33,6 @@ yum --assumeyes install debootstrap schroot
# To show available debootstrap scripts:
# ls /usr/share/debootstrap/scripts
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Installed 'debootstrap' [redhat]." | tee /dev/tty
diff --git a/lmi_setup_11.sh b/lmi_setup_11.sh
index d566597..ab95c0d 100755
--- a/lmi_setup_11.sh
+++ b/lmi_setup_11.sh
@@ -82,4 +82,5 @@ findmnt /srv/chroot/"${CHRTNAME}"/var/cache/apt/archives
findmnt /proc
findmnt /dev/pts
-echo Installed debian "${CODENAME}" chroot.
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Ran 'debootstrap'." | tee /dev/tty
diff --git a/lmi_setup_20.sh b/lmi_setup_20.sh
index e6a58ae..f8757bf 100755
--- a/lmi_setup_20.sh
+++ b/lmi_setup_20.sh
@@ -144,3 +144,6 @@ apt-get --assume-yes install wget g++-mingw-w64 automake
libtool make \
# No schema files found: doing nothing.
# Warning: The home dir /run/uuidd you specified can't be accessed: No such
file or directory
# Not creating home directory `/run/uuidd'.
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Installed debian packages." | tee /dev/tty
diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index 98eb984..ad1565e 100755
--- a/lmi_setup_21.sh
+++ b/lmi_setup_21.sh
@@ -143,3 +143,6 @@ EOF
apt-get --assume-yes update
apt-get --assume-yes dist-upgrade
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Updated debian chroot." | tee /dev/tty
diff --git a/lmi_setup_30.sh b/lmi_setup_30.sh
index 53f0cf8..4d9f726 100755
--- a/lmi_setup_30.sh
+++ b/lmi_setup_30.sh
@@ -80,3 +80,6 @@ cp -a ~/.ssh/ /srv/chroot/${CHRTNAME}/home/"${NORMAL_USER}"
|| true
# HashKnownHosts no
# See the discussion of hashing (inter alia) here:
# https://lists.nongnu.org/archive/html/lmi/2018-01/msg00003.html
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Copied optional files." | tee /dev/tty
diff --git a/lmi_setup_40.sh b/lmi_setup_40.sh
index 4bc2337..ee7fd65 100755
--- a/lmi_setup_40.sh
+++ b/lmi_setup_40.sh
@@ -60,3 +60,6 @@ wine regedit
# specify appropriate size: e.g., 1900x1120 for a 1920x1200 monitor
# (the other options don't seem to matter)
# then restart the application
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Installed 'wine'." | tee /dev/tty
diff --git a/lmi_setup_41.sh b/lmi_setup_41.sh
index 5209453..ee18b33 100755
--- a/lmi_setup_41.sh
+++ b/lmi_setup_41.sh
@@ -70,3 +70,6 @@ git config --global push.default simple
# Use your own name and email address.
git config --global user.email gchicares@sbcglobal.net
git config --global user.name "Gregory W. Chicares"
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Configured 'wine' etc. for $NORMAL_USER." | tee /dev/tty
diff --git a/lmi_setup_42.sh b/lmi_setup_42.sh
index ce68c9e..4f2c581 100755
--- a/lmi_setup_42.sh
+++ b/lmi_setup_42.sh
@@ -47,3 +47,6 @@ mkdir -p "${logdir}"
# export DISPLAY=":0.0"
# cd /opt/lmi/bin || { printf 'failed: cd\n'; exit 3; }
# wine ./lmi_wx_shared.exe --ash_nazg --data_path=../data
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Installed lmi for $NORMAL_USER." | tee /dev/tty
diff --git a/lmi_setup_43.sh b/lmi_setup_43.sh
index 6a7b648..9f034e5 100755
--- a/lmi_setup_43.sh
+++ b/lmi_setup_43.sh
@@ -134,3 +134,6 @@ git clone git://git.savannah.nongnu.org/lmi.git \
cd lmi || { printf 'failed: cd\n'; exit 3; }
find . -path ./.git -prune -o -type f -print0 \
| xargs --null --max-args=1 --max-procs="$(nproc)" --replace='{}' touch
'--reference=/opt/lmi/src/lmi/{}' '{}'
+
+stamp=$(date -u +'%Y%m%dT%H%M%SZ')
+echo "$stamp $0: Tested lmi for $NORMAL_USER." | tee /dev/tty