From fe6b632b740aaa4f120c2bf114626369a53e930c Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Fri, 4 Jul 2014 16:04:17 +0200 Subject: [PATCH] fixing upgrade from 3.0 / 3.1 / 3.2 --- install/alternc.install | 2 +- install/upgrade_check.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/alternc.install b/install/alternc.install index dd82800e..8a43f490 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # ---------------------------------------------------------------------- # AlternC - Web Hosting System diff --git a/install/upgrade_check.sh b/install/upgrade_check.sh index 026256cb..19e5b637 100755 --- a/install/upgrade_check.sh +++ b/install/upgrade_check.sh @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # this script will look for upgrade scripts in # /usr/share/alternc/install/upgrades and execute them based on the @@ -31,7 +31,7 @@ then # this is a *version number*, not a *last upgrade script* we have this *border case* if [ "$oldvers" = "3.1" ] then - oldvers="3.1.0~b.php" + oldvers="3.1.0~c.sh" fi else echo "##############################################" @@ -71,7 +71,7 @@ for file in $( ls $extensions | sort -n ) ; do cat $file echo "UPDATE alternc_status SET value='$file' WHERE name='alternc_version';" echo "COMMIT;" - ) | mysql --defaults-file=/etc/alternc/my.cnf + ) | mysql -f --defaults-file=/etc/alternc/my.cnf ;; php) php -q $file