diff --git a/DOLIBARR_PACKAGES/dolibarr_5.0.3-4_all.deb b/DOLIBARR_PACKAGES/dolibarr_6.0.0-4_all.deb similarity index 71% rename from DOLIBARR_PACKAGES/dolibarr_5.0.3-4_all.deb rename to DOLIBARR_PACKAGES/dolibarr_6.0.0-4_all.deb index de3155646458a7e53097872d0a7d2d25a4f6fee9..13e04f267ce73dbd24789daa0f0fb86cdb49e192 100644 Binary files a/DOLIBARR_PACKAGES/dolibarr_5.0.3-4_all.deb and b/DOLIBARR_PACKAGES/dolibarr_6.0.0-4_all.deb differ diff --git a/installDolibarr.sh b/installDolibarr.sh index 19a71d3e178eafa52edca5151770473083b6c5f5..7d28fac585aa7ab528139d93f5cd6815e0f87d4d 100644 --- a/installDolibarr.sh +++ b/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 diff --git a/run.sh b/run.sh index 8587384e2fb6d4569f758e919a07cd0b5653e644..68855e909f4e948bb3e8b61e177e137707fa9298 100644 --- a/run.sh +++ b/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 diff --git a/upgradeAll.sh b/upgradeAll.sh index 641ca0fcfd6ad3de3ab516c57d2a55fc258a0d5e..62084b4e429cc1e5a2ddb600432eb7be04ddb867 100644 --- a/upgradeAll.sh +++ b/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}'` \ diff --git a/upgradeDolibarr.sh b/upgradeDolibarr.sh index 3e413e6a886bfe79abd0dcf188e0e94ca3dc4459..6193901f5f3f660cc0e1c76c5cac4f739391fc4f 100644 --- a/upgradeDolibarr.sh +++ b/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" diff --git a/upgradeTetrasBack.sh b/upgradeTetrasBack.sh index 39d32c22ac27f0110cc2ab672335650c4d981cce..b257d88044965eb18abe0c138759fa92c876cdb1 100644 --- a/upgradeTetrasBack.sh +++ b/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"