diff --git a/upgrade/Collabora.sh b/upgrade/Collabora.sh index d144783f0c19633a7b2c5c9f292f569a554b494e..30bbe0d24b767f84dac8b85c41e8847c6ef8a6cc 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 31fe92e51ef8b552b4c583fa62c996a99a90ee0d..d38b951ae063c09482465d19b8ea43a3717c9304 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 a23b5beb35058441cbc0ea54c03372d981b10a2d..59e7740a201a2eabdcc55414e986e0ed563fab6e 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 b5bfe5b629560cb56eb78c4acf99b98ec4fed661..0d85c2d08febb0c9924579382ff117c17c6c19f7 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 675bbd9c318cc8f8d86b876d7237d78db6c2749d..fa193f15cc98450c608cb08d29436b3773cda6d4 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 163b9b2101ac4eb2e66540fc3cbe167872e255a6..3a01476880cd10167a9a153931c5e11d96a259ed 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)