diff --git a/utils/attestDolibarr.sh b/utils/attestDolibarr.sh index 3b047f68dfd8201a754796872da3aff77d86f9b0..2f750627e73ca6cc54e4431827e13362a5266f28 100755 --- a/utils/attestDolibarr.sh +++ b/utils/attestDolibarr.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 version=7.0 dol_path="/usr/share/dolibarr" diff --git a/utils/clamav-weekly.sh b/utils/clamav-weekly.sh index 009b4aff0ef20b244b48b7d59683e4f568c43ccd..d8dab0ad6fda74d546639b8308aaf815fa95ad93 100755 --- a/utils/clamav-weekly.sh +++ b/utils/clamav-weekly.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") ===" LOGFILE="/var/log/clamav.log"; EMAIL_TO="root"; diff --git a/utils/configure_base_tools.sh b/utils/configure_base_tools.sh index baaae43f93b50d7484e5136027890aeead97cee8..732acb1dc8f4e7def666a7742c82cb6c85f37d05 100755 --- a/utils/configure_base_tools.sh +++ b/utils/configure_base_tools.sh @@ -1,5 +1,6 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" + if [ -z "$(grep '^alias ls=' /root/.bashrc)" ] then diff --git a/utils/expandCertbot.sh b/utils/expandCertbot.sh index 4504b13d29affa87d094e79e66ca5f139c53ba4f..e51d8ce4596eb5b0b4414d7517927057bdb6ff18 100644 --- a/utils/expandCertbot.sh +++ b/utils/expandCertbot.sh @@ -1,5 +1,5 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" if [ -z "$2" ] then diff --git a/utils/getLastDolibarrDeb.sh b/utils/getLastDolibarrDeb.sh index 7b4f9df27d6e27973ab5f9c459bbf9cfdbba979f..042338fae73706c9cd4ea6694040eab42523e336 100755 --- a/utils/getLastDolibarrDeb.sh +++ b/utils/getLastDolibarrDeb.sh @@ -1,5 +1,5 @@ #!/bin/bash -echo "============= $(basename "$0") =================" +echo "RUN $(basename "$0") ===" # Get Dolideb version list curl \ diff --git a/utils/getip.sh b/utils/getip.sh index 378ccb68c205b3355f967e1b393a2359868802a3..1c42efd8f68577e6fc8b3293556f536f805e3144 100755 --- a/utils/getip.sh +++ b/utils/getip.sh @@ -15,7 +15,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") ===" isIP() { diff --git a/utils/nextcloudStrongDirectoryPermissions.sh b/utils/nextcloudStrongDirectoryPermissions.sh index d9e7304e36c65ad590d69437b3b2a4e7ef47b509..c4a99025887d1963c897822d001b92656e4ba26b 100755 --- a/utils/nextcloudStrongDirectoryPermissions.sh +++ b/utils/nextcloudStrongDirectoryPermissions.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") ===" # from https://doc.owncloud.org/server/9.0/admin_manual/installation/installation_wizard.html?highlight=trusted#trusted-domains NEXTCLOUD_INSTALL_DIR=${NEXTCLOUD_INSTALL_DIR:-'/var/www/nextcloud'} diff --git a/utils/startcollabora.sh b/utils/startcollabora.sh index ebf8403644249fe55937836baf134cd8c4f985a3..54654f406b6e1372e66f2a2614f9df3c8992d595 100755 --- a/utils/startcollabora.sh +++ b/utils/startcollabora.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` . $SCRIPT_DIRECTORY/main.env