[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 3d2fd82 2/2: Abstract the lmi git URL base
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 3d2fd82 2/2: Abstract the lmi git URL base |
|
Date: |
Tue, 8 Oct 2019 19:43:29 -0400 (EDT) |
branch: master
commit 3d2fd82b93418122cdec7caa81f346632e2af924
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Abstract the lmi git URL base
---
install_centos.sh | 20 ++++++++++----------
install_redhat.sh | 26 ++++++++++----------------
lmi_setup_00.sh | 20 ++++++++++----------
lmi_setup_21.sh | 6 +++---
lmi_setup_42.sh | 2 +-
lmi_setup_inc.sh | 3 +++
6 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/install_centos.sh b/install_centos.sh
index 4414216..4fc9118 100755
--- a/install_centos.sh
+++ b/install_centos.sh
@@ -138,16 +138,16 @@ set -vx
echo "Adapted from 'lmi_setup_00.sh'."
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_10.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_11.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_20.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_21.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_30.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_40.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_41.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_42.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_43.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_inc.sh'
+wget -N "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_11.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_20.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_21.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_30.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_40.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_41.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_42.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_43.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_inc.sh
chmod +x lmi_setup_*.sh
. ./lmi_setup_inc.sh
diff --git a/install_redhat.sh b/install_redhat.sh
index efc8a99..089abf8 100755
--- a/install_redhat.sh
+++ b/install_redhat.sh
@@ -84,24 +84,18 @@ mount --bind /srv/cache_for_lmi
/srv/chroot/"${CHRTNAME}"/cache_for_lmi || echo
mkdir -p /var/cache/"${CODENAME}"
mount --bind /var/cache/"${CODENAME}"
/srv/chroot/"${CHRTNAME}"/var/cache/apt/archives || echo "Oops."
-# For a server that, bizarrely, blocks gnu.org but allows github.com:
-#
%s,https://git.savannah.nongnu.org/cgit/lmi.git/plain/,https://github.com/vadz/lmi/raw/master/,
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_10.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_11.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_20.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_21.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_30.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_40.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_41.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_42.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_43.sh'
-wget -N 'https://github.com/vadz/lmi/raw/master/lmi_setup_inc.sh'
+wget -N "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_11.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_20.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_21.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_30.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_40.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_41.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_42.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_43.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_inc.sh
chmod +x lmi_setup_*.sh
-for z in lmi_setup_*.sh; do \
- sed -i "$z" -e
's,https://git.savannah.nongnu.org/cgit/lmi.git/plain/,https://github.com/vadz/lmi/raw/master/,'
-done
-
. ./lmi_setup_inc.sh
set -evx
diff --git a/lmi_setup_00.sh b/lmi_setup_00.sh
index 1db6708..9064f96 100755
--- a/lmi_setup_00.sh
+++ b/lmi_setup_00.sh
@@ -31,16 +31,16 @@ assert_not_chrooted
stamp0=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo "Started: $stamp0"
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_10.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_11.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_20.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_21.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_30.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_40.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_41.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_42.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_43.sh'
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/lmi_setup_inc.sh'
+wget -N "${GIT_URL_BASE}"/lmi_setup_10.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_11.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_20.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_21.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_30.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_40.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_41.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_42.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_43.sh
+wget -N "${GIT_URL_BASE}"/lmi_setup_inc.sh
chmod +x lmi_setup_*.sh
./lmi_setup_10.sh
diff --git a/lmi_setup_21.sh b/lmi_setup_21.sh
index 7f7aebd..fcc1fdc 100755
--- a/lmi_setup_21.sh
+++ b/lmi_setup_21.sh
@@ -79,7 +79,7 @@ patch --dry-run --strip=0 --directory=/
</home/"${NORMAL_USER}"/ltmain.sh.patch
# Configure zsh, for root as well as the user configured above.
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/gwc/.zshrc'
+wget -N "${GIT_URL_BASE}"/gwc/.zshrc
mv .zshrc ~
cp -a ~/.zshrc /home/"${NORMAL_USER}"/.zshrc
chown "${NORMAL_USER}":"${NORMAL_USER}" /home/"${NORMAL_USER}"/.zshrc
@@ -87,7 +87,7 @@ chown "${NORMAL_USER}":"${NORMAL_USER}"
/home/"${NORMAL_USER}"/.zshrc
# Configure vim. Rather than trying to split its contents between
# '~/.vimrc' and '/etc/vim/vimrc.local', just copy it everywhither.
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/gwc/.vimrc'
+wget -N "${GIT_URL_BASE}"/gwc/.vimrc
mv .vimrc ~
cp -a ~/.vimrc /etc/vim/vimrc.local
cp -a ~/.vimrc /home/"${NORMAL_USER}"/.vimrc
@@ -99,7 +99,7 @@ mkdir ~/.vim
mkdir /home/"${NORMAL_USER}"/.vim
chown "${NORMAL_USER}":"${NORMAL_USER}" /home/"${NORMAL_USER}"/.vim
# It's a much better idea to copy a mature spellfile hither:
-wget -N
'https://git.savannah.nongnu.org/cgit/lmi.git/plain/gwc/.vim/spell/en.utf-8.add'
+wget -N "${GIT_URL_BASE}"/gwc/.vim/spell/en.utf-8.add
mkdir ~/.vim/spell
mv en.utf-8.add ~/.vim/spell/en.utf-8.add
mkdir /home/"${NORMAL_USER}"/.vim/spell
diff --git a/lmi_setup_42.sh b/lmi_setup_42.sh
index 798af20..611b1e2 100755
--- a/lmi_setup_42.sh
+++ b/lmi_setup_42.sh
@@ -31,7 +31,7 @@ assert_chrooted
# Install lmi for wine.
cd ~ || { printf 'failed: cd\n'; exit 3; }
-wget -N 'https://git.savannah.nongnu.org/cgit/lmi.git/plain/install_msw.sh'
+wget -N "${GIT_URL_BASE}"/install_msw.sh
chmod +x install_msw.sh
./install_msw.sh >log 2>&1
diff --git a/lmi_setup_inc.sh b/lmi_setup_inc.sh
index 6769529..d2584d1 100755
--- a/lmi_setup_inc.sh
+++ b/lmi_setup_inc.sh
@@ -34,6 +34,9 @@ CODENAME=bullseye
CHRTVER=1
CHRTNAME=lmi_${CODENAME}_${CHRTVER}
NORMAL_USER=greg
+GIT_URL_BASE=https://git.savannah.nongnu.org/cgit/lmi.git/plain
+# For a server that, bizarrely, blocks gnu.org but allows github.com:
+# GIT_URL_BASE=https://github.com/vadz/lmi/raw/master
set +vx