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 c11cc46d627f777dc9f8669d89777dd905ea2f10..6cac0bfb0164eee9a6a0159729a854f0aaebb19e 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 78e27d131ef21ef29c05c3e8e679502dd2bd4581..8587384e2fb6d4569f758e919a07cd0b5653e644 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 13fd8141c37d7e2dbf9eea5d1fda20a961a141f2..9ce073afa6970a7b5b85c7555ae6e2f2a1caa41d 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