From 24b71775bf926a661529bea3a2a6441cce8ad19c Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Mon, 28 Aug 2017 10:44:23 +0200
Subject: [PATCH] More modular install
---
initInstall.sh => installBase.sh | 0
main.env.sample | 1 +
run.sh | 2 --
upgradeAll.sh | 17 ++++++++++++++---
4 files changed, 15 insertions(+), 5 deletions(-)
rename initInstall.sh => installBase.sh (100%)
diff --git a/initInstall.sh b/installBase.sh
similarity index 100%
rename from initInstall.sh
rename to installBase.sh
diff --git a/main.env.sample b/main.env.sample
index c11cc46..6cac0bf 100644
--- a/main.env.sample
+++ b/main.env.sample
@@ -1,3 +1,4 @@
+export MODS="Base MySQL Nextcloud Dolibarr TetrasBack"
export DOMAIN="dev.tetras-libre.fr"
export SERVER_ADMIN="admin@dev.tetras-libre.fr"
export WEB_SERVER=apache2
diff --git a/run.sh b/run.sh
index 78e27d1..8587384 100644
--- a/run.sh
+++ b/run.sh
@@ -25,8 +25,6 @@ then
fi
. `pwd`/main.env
-MODS="initInstall installMySQL installNextcloud installDolibarr installTetrasBack"
-
for mod in $MODS
do
if [ -f $mod.sh ]
diff --git a/upgradeAll.sh b/upgradeAll.sh
index 13fd814..9ce073a 100644
--- a/upgradeAll.sh
+++ b/upgradeAll.sh
@@ -18,9 +18,20 @@
aptitude update && aptitude upgrade
DIR=`dirname $0`
+. $DIR/main.env
. $DIR/installNextcloud.env
-. $DIR/upgradeNextcloud.sh
-. $DIR/upgradeTetrasBack.sh
-. $DIR/upgradeDolibarr.sh
+if [ -z "$MODS" ]
+then
+ echo "Please update your main.env to list the installed modules"
+ exit 1
+fi
+for mod in $MODS
+do
+ script="$DIR/upgrade$mod.sh"
+ if [ -f $script ]
+ then
+ . $script
+ fi
+done
systemctl restart systemd-logind
checkrestart
--
GitLab