| tcleanup; add overridable env vars to shell scripts - amprolla - devuan's apt repo merger |
| git clone git://parazyd.org/amprolla.git |
| Log |
| Files |
| Refs |
| README |
| LICENSE |
| --- |
| commit 94cbcd4db7b57cd0ce3d6ceab7b9c804ee2489c1 |
| parent ea2b4dd29579b36f02547ba089383cdefa463f8c |
| Author: parazyd |
| Date: Mon, 14 Aug 2017 13:46:36 +0200
cleanup; add overridable env vars to shell scripts
Diffstat:
M TODO.md | 1 -
M contrib/populate_aliases.sh | 2 +-
M orchestrate.sh | 12 ++++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
--- |
| diff --git a/TODO.md b/TODO.md |
| t@@ -4,4 +4,3 @@ amprolla TODO
* Import devuan/debian keyrings as git submodules and make a script to
verify them via a keyserver
* Translation files
-* Investigate why detached GPG signatures end up broken |
| diff --git a/contrib/populate_aliases.sh b/contrib/populate_aliases.sh |
| t@@ -8,7 +8,7 @@ dryrun=""
[ "$1" = "-d" ] && dryrun="echo"
# make sure these correlate to lib/config.py
-REPO_ROOT="/srv/amprolla"
+REPO_ROOT="${REPO_ROOT:-/srv/amprolla/merged}"
PAIRS="
jessie 1.0 |
| diff --git a/orchestrate.sh b/orchestrate.sh |
| t@@ -4,8 +4,8 @@
# Orchestration of incremental updates
# Make sure these correlate to lib/config.py
-AMPROLLA_UPDATE=/srv/amprolla/amprolla_update.py
-REPO_ROOT=/srv/amprolla
+AMPROLLA_UPDATE="${AMPROLLA_UPDATE:-/srv/amprolla/amprolla_update.py}"
+REPO_ROOT="${REPO_ROOT:-/srv/amprolla}"
# TODO: Remove the while loop and run with cron after testing phase
t@@ -16,12 +16,16 @@ while true; do
ln -snf "$REPO_ROOT"/merged-production "$REPO_ROOT"/merged
break
}
- printf "rsyncing volatile to production...\n"
+
+ printf "rsyncing volatile to production... "
rsync --delete -raX "$REPO_ROOT"/merged-volatile/* "$REPO_ROOT"/merged-production
printf "done!\n"
+
ln -snf "$REPO_ROOT"/merged-production "$REPO_ROOT"/merged
- printf "rsyncing volatile to staging...\n"
+
+ printf "rsyncing volatile to staging... "
rsync --delete -raX "$REPO_ROOT"/merged-volatile/* "$REPO_ROOT"/merged-staging
printf "done!\n"
+
sleep 3600
done |