Merge branch 'master' of...

Merge branch 'master' of ssh://gitlab.tetras-libre.fr:2222/tetras-libre/NoCloud-Auto-Installer into github

installDolibarr.sh

@@ -18,6 +18,7 @@
 
 set -o nounset                              # Treat unset variables as an error
 
+. `pwd`/main.env
 if [ -f installDolibarr.env ]
 then
     . `pwd`/installDolibarr.env
@@ -97,9 +98,9 @@ then
     echo "/home/dolibarr ${DOLIBARR_DOCUMENTS_DIR} none bind 0 0"
 else
     echo "\"/home/dolibarr ${DOLIBARR_DOCUMENTS_DIR} none bind 0 0\"" \
-        "> /etc/fstab"
+        ">> /etc/fstab"
     echo "/home/dolibarr ${DOLIBARR_DOCUMENTS_DIR} none bind 0 0" \
-        > /etc/fstab
+        >> /etc/fstab
 fi
 mount ${VERBOSE:+v} /usr/share/dolibarr/documents
 

run.sh

@@ -27,8 +27,9 @@ fi
 
 for mod in $MODS
 do
+    mod="install$mod"
     if [ -f $mod.sh ]
     then
-        sh `pwd`/$mod.sh | tee -a $mod.log install.log
+        . `pwd`/$mod.sh | tee -a $mod.log install.log
     fi
 done

upgradeAll.sh

@@ -36,7 +36,7 @@ do
     script="$DIR/upgrade$mod.sh"
     if [ -f $script ]
     then
-        . $script
+        /bin/bash $script
     fi
 done
 services="`checkrestart | awk '/^service/{print $2} /^systemctl/{print $3}'` \

upgradeDolibarr.sh

@@ -24,7 +24,7 @@ then
 fi
 if [ "$MAINTENANCE_LEVEL" == "security" ] && [ "$1" != "force" ]
 then
-    echo "Dolibar upgrade is disabled for security mode, to for upgrade, run:"
+    echo "Dolibar upgrade is disabled for security mode, to force upgrade, run:"
     echo -e "\t$0 force"
     exit 1
 fi
@@ -39,6 +39,9 @@ then
 echo "Current version of Dolibarr is the last version in our repo, nothing to do"
     exit
 fi
+echo "Backing up database"
+mysqldump --databases dolibarr > /root/dolibbarr.sql
+mysqldump --all-databases > /root/dbs.sql
 echo "Installing $package"
 dpkg -i $package
 echo "Fixing dependencies"

upgradeTetrasBack.sh

@@ -16,8 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-OLD=`pwd`
-DIR=$DIR
+OLD=$PWD
+DIR="$OLD/Tetras-back"
 if [ ! -d $DIR ]
 then
     echo "Tetras-back not installed, aborting"