[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master dba418b 02/10: Source 'lmi_setup_inc' in ever
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master dba418b 02/10: Source 'lmi_setup_inc' in every other 'lmi_setup*' script |
Date: |
Thu, 26 Sep 2019 09:40:18 -0400 (EDT) |
branch: master
commit dba418beecda30bffc318b71cba07b295fab3141
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Source 'lmi_setup_inc' in every other 'lmi_setup*' script
---
lmi_setup_10.sh | 2 ++
lmi_setup_11.sh | 2 ++
lmi_setup_20.sh | 2 ++
lmi_setup_21.sh | 2 ++
lmi_setup_30.sh | 2 ++
lmi_setup_40.sh | 2 ++
lmi_setup_41.sh | 2 ++
lmi_setup_42.sh | 2 ++
lmi_setup_43.sh | 2 ++
9 files changed, 18 insertions(+)
diff --git a/lmi_setup_10.sh b/lmi_setup_10.sh
index 6bb1b73..e1ec2a0 100644
--- a/lmi_setup_10.sh
+++ b/lmi_setup_10.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
apt-get update
apt-get install schroot debootstrap
diff --git a/lmi_setup_11.sh b/lmi_setup_11.sh
index 53792b6..2d7a5e7 100644
--- a/lmi_setup_11.sh
+++ b/lmi_setup_11.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
# Unpack the OS tarball into the particular chroot being created.
# (If the preceding apt-get and debootstrap steps have already been
# completed once, then skip them and start here.)
diff --git a/lmi_setup_20.sh b/lmi_setup_20.sh
index ef6e14a..2543491 100644
--- a/lmi_setup_20.sh
+++ b/lmi_setup_20.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
# Add i386 before installing wine, so that wine can run 32-bit .exe's .
dpkg --add-architecture i386
diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index b212264..70b5506 100644
--- a/lmi_setup_21.sh
+++ b/lmi_setup_21.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
addgroup --gid=1000 greg
adduser --gid=1000 --uid=1000 greg
# enter user password, twice
diff --git a/lmi_setup_30.sh b/lmi_setup_30.sh
index b5c2723..65eb2a8 100644
--- a/lmi_setup_30.sh
+++ b/lmi_setup_30.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
# If cached lmi downloads are available elsewhere, copy them now.
# Copying cache_for_lmi/downloads/ is an optional step that merely
# conserves bandwidth. Directory cache_for_lmi/ in a native msw
diff --git a/lmi_setup_40.sh b/lmi_setup_40.sh
index 2b7eac9..858c8da 100644
--- a/lmi_setup_40.sh
+++ b/lmi_setup_40.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
# Initialize wine. See:
# https://lists.nongnu.org/archive/html/lmi/2016-10/msg00002.html
WINEDLLOVERRIDES=mscoree=d wine wineboot
diff --git a/lmi_setup_41.sh b/lmi_setup_41.sh
index 3fe5272..44c9656 100644
--- a/lmi_setup_41.sh
+++ b/lmi_setup_41.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
# Symlink directories used by lmi, so that both native and wine
# builds use the same directories and can share the same
# architecture-independent 'configurable_settings.xml'--much like the
diff --git a/lmi_setup_42.sh b/lmi_setup_42.sh
index d8c07b5..160a994 100644
--- a/lmi_setup_42.sh
+++ b/lmi_setup_42.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
# Install lmi for wine.
wget -N 'http://git.savannah.gnu.org/cgit/lmi.git/plain/install_msw.sh'
diff --git a/lmi_setup_43.sh b/lmi_setup_43.sh
index 753256a..81b44f9 100644
--- a/lmi_setup_43.sh
+++ b/lmi_setup_43.sh
@@ -21,6 +21,8 @@
# email: <address@hidden>
# snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+. ./lmi_setup_inc.sh
+
# Symlink the repository's hooks/ directory:
cd /opt/lmi/src/lmi
mv .git/hooks .git/hooks-orig
- [lmi-commits] [lmi] master updated (6557d30 -> 5ae814c), Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master 6bde648 05/10: Print zsh script name when shellcheck fails, Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master dba418b 02/10: Source 'lmi_setup_inc' in every other 'lmi_setup*' script,
Greg Chicares <=
- [lmi-commits] [lmi] master 13972c4 06/10: Enable verbose tracing in 'lmi_setup*.sh', Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master 8838b01 07/10: Make sure each 'lmi_setup*' script is run in the right environment, Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master 96e0911 08/10: Prefer https to http, Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master 5ae814c 10/10: Prepare to test scripted chroot creation, Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master c1cbb7f 04/10: Start writing a master 'lmi_setup*' script to call the others, Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master 890f9e3 01/10: Augment redhat notes, Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master 606a0cf 09/10: Reuse an existing debootstrap tarball if available, Greg Chicares, 2019/09/26
- [lmi-commits] [lmi] master 8e2ced7 03/10: Improve 'lmi_setup_*.sh', notably resolving shellcheck issues, Greg Chicares, 2019/09/26