[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 6916315 4/4: Experimentally reduce script ver
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 6916315 4/4: Experimentally reduce script verbosity |
Date: |
Mon, 30 Sep 2019 11:08:29 -0400 (EDT) |
branch: master
commit 691631561c254d24078f00232f858b430e1de690
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Experimentally reduce script verbosity
---
lmi_setup_00.sh | 4 ++--
lmi_setup_10.sh | 4 ++--
lmi_setup_11.sh | 4 ++--
lmi_setup_20.sh | 4 ++--
lmi_setup_21.sh | 4 ++--
lmi_setup_30.sh | 4 ++--
lmi_setup_40.sh | 4 ++--
lmi_setup_41.sh | 4 ++--
lmi_setup_42.sh | 4 ++--
lmi_setup_43.sh | 4 ++--
lmi_setup_inc.sh | 5 +++++
11 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/lmi_setup_00.sh b/lmi_setup_00.sh
index a03d364..2b5e057 100755
--- a/lmi_setup_00.sh
+++ b/lmi_setup_00.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_su
assert_not_chrooted
diff --git a/lmi_setup_10.sh b/lmi_setup_10.sh
index 1ad2552..881af04 100755
--- a/lmi_setup_10.sh
+++ b/lmi_setup_10.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_su
assert_not_chrooted
diff --git a/lmi_setup_11.sh b/lmi_setup_11.sh
index c84d510..32238c2 100755
--- a/lmi_setup_11.sh
+++ b/lmi_setup_11.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_su
assert_not_chrooted
diff --git a/lmi_setup_20.sh b/lmi_setup_20.sh
index c41d40f..05b0c92 100755
--- a/lmi_setup_20.sh
+++ b/lmi_setup_20.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_su
assert_chrooted
diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index 0bd5792..8d1ffec 100755
--- a/lmi_setup_21.sh
+++ b/lmi_setup_21.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_su
assert_chrooted
diff --git a/lmi_setup_30.sh b/lmi_setup_30.sh
index 896a9cc..09d2284 100755
--- a/lmi_setup_30.sh
+++ b/lmi_setup_30.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_not_su
assert_not_chrooted
diff --git a/lmi_setup_40.sh b/lmi_setup_40.sh
index 7d531e1..7585451 100755
--- a/lmi_setup_40.sh
+++ b/lmi_setup_40.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_not_su
assert_chrooted
diff --git a/lmi_setup_41.sh b/lmi_setup_41.sh
index 7933ee7..7e54096 100755
--- a/lmi_setup_41.sh
+++ b/lmi_setup_41.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_not_su
assert_chrooted
diff --git a/lmi_setup_42.sh b/lmi_setup_42.sh
index 668a7fd..798af20 100755
--- a/lmi_setup_42.sh
+++ b/lmi_setup_42.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_not_su
assert_chrooted
diff --git a/lmi_setup_43.sh b/lmi_setup_43.sh
index 197202c..6e8c144 100755
--- a/lmi_setup_43.sh
+++ b/lmi_setup_43.sh
@@ -21,10 +21,10 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-set -vx
-
. ./lmi_setup_inc.sh
+set -vx
+
assert_not_su
assert_chrooted
diff --git a/lmi_setup_inc.sh b/lmi_setup_inc.sh
index 432dd93..84a769e 100755
--- a/lmi_setup_inc.sh
+++ b/lmi_setup_inc.sh
@@ -27,10 +27,15 @@
# shellcheck disable=SC2034
# (this file should only be sourced)
+
+set -vx
+
CODENAME=bullseye
CHRTVER=eraseme
CHRTNAME=lmi_${CODENAME}${CHRTVER}
+set +vx
+
assert_su()
{
if [ "$(id -u)" -ne 0 ]; then