From 93e29e7fe720dc2b6abc2db4f6caa4e229c599d5 Mon Sep 17 00:00:00 2001
From: Elian Loraux <elian.loraux@tetras-libre.fr>
Date: Wed, 23 Oct 2024 11:31:10 +0200
Subject: [PATCH] update loaded env file and prompte for update file

---
 upgrade/Collabora.sh  | 8 +++++---
 upgrade/Dolibarr.sh   | 8 +++++---
 upgrade/Nextcloud.sh  | 2 +-
 upgrade/TetrasBack.sh | 2 +-
 upgrade/Traefik.sh    | 2 +-
 upgrade/WebServer.sh  | 8 +++++---
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/upgrade/Collabora.sh b/upgrade/Collabora.sh
index d144783..30bbe0d 100644
--- a/upgrade/Collabora.sh
+++ b/upgrade/Collabora.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
 
-echo "============= $(basename "$0") ================="
+echo "RUN $(basename "$0") ==="
 
-if [ ! -e $(pwd)/$(dirname "$0")/../main.env ]
+if [ ! -e $(dirname "$0")/../main.env ]
 then
     echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it"
     exit 1
+else
+    echo "Environment file loaded"
 fi
-. $(pwd)/$(dirname "$0")/../main.env
+. $(dirname "$0")/../main.env
 
 SCRIPT_DIRECTORY=$(dirname $0)
 if [ -z "$(grep 'capabilities' /etc/apache2/sites-available/collabora.conf)" ]; then
diff --git a/upgrade/Dolibarr.sh b/upgrade/Dolibarr.sh
index 31fe92e..d38b951 100644
--- a/upgrade/Dolibarr.sh
+++ b/upgrade/Dolibarr.sh
@@ -16,14 +16,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-echo "============= $(basename "$0") ================="
+echo "RUN $(basename "$0") ==="
 
-if [ ! -e $(pwd)/$(dirname "$0")/../main.env ]
+if [ ! -e $(dirname "$0")/../main.env ]
 then
     echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it"
     exit 1
+else
+    echo "Environment file loaded"
 fi
-. $(pwd)/$(dirname "$0")/../main.env
+. $(dirname "$0")/../main.env
 
 DOLIBARR_DB=${DOLIBARR_DB:-"dolibarr"}
 if [ -z "`dpkg -l | grep dolibarr`" ]
diff --git a/upgrade/Nextcloud.sh b/upgrade/Nextcloud.sh
index a23b5be..59e7740 100644
--- a/upgrade/Nextcloud.sh
+++ b/upgrade/Nextcloud.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-echo "============= $(basename "$0") ================="
+echo "RUN $(basename "$0") ==="
 
 NEXTCLOUD_INSTALL_DIR=${NEXTCLOUD_INSTALL_DIR:-'/var/www/nextcloud'}
 NEXTCLOUD_INSTALL_DIR=`echo $NEXTCLOUD_INSTALL_DIR | sed 's@/*$@@'`
diff --git a/upgrade/TetrasBack.sh b/upgrade/TetrasBack.sh
index b5bfe5b..0d85c2d 100644
--- a/upgrade/TetrasBack.sh
+++ b/upgrade/TetrasBack.sh
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-echo "============= $(basename "$0") ================="
+echo "RUN $(basename "$0") ==="
 
 OLD=$PWD
 DIR="$OLD/Tetras-back"
diff --git a/upgrade/Traefik.sh b/upgrade/Traefik.sh
index 675bbd9..fa193f1 100644
--- a/upgrade/Traefik.sh
+++ b/upgrade/Traefik.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-echo "============= $(basename "$0") ================="
+echo "=== RUN $(basename "$0") ==="
 
 # Services maintenance
 cd /home/dockerweb
diff --git a/upgrade/WebServer.sh b/upgrade/WebServer.sh
index 163b9b2..3a01476 100644
--- a/upgrade/WebServer.sh
+++ b/upgrade/WebServer.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
 
-echo "============= $(basename "$0") ================="
+echo "RUN $(basename "$0") ==="
 
-if [ ! -e $(pwd)/$(dirname "$0")/../main.env ]
+if [ ! -e $(dirname "$0")/../main.env ]
 then
     echo "Please copy in racine of NoCloud Auto Installer main.env.sample to main.env and edit it"
     exit 1
+else
+    echo "Environment file loaded"
 fi
-. $(pwd)/$(dirname "$0")/../main.env
+. $(dirname "$0")/../main.env
 
 # Switch to php-fpm
 ver=$(php --version | awk '{print $2}' | head -n 1 | cut -d . -f 1,2)
-- 
GitLab