Shouldn't have commited that.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/upgrade/account/copy_tables.php b/upgrade/account/copy_tables.php
index 7749f8f..027b3e7 100755 (executable)
--- a/upgrade/account/copy_tables.php
+++ b/upgrade/account/copy_tables.php
@@ -22,6 +22,10 @@
 
 require('./connect.db.inc.php');
 
+$globals->dbuser = 'admin';
+$globals->dbpwd  = 'lknjiuhb';
+$globals->debug  = 1;
+
 function copyTable($source, $target, $convertToInnoDB = true)
 {
     XDB::execute('CREATE TABLE  ' . $target . '

diff --git a/upgrade/inc/pervasive.sh b/upgrade/inc/pervasive.sh
index ede0942..3eb0dae 100755 (executable)
--- a/upgrade/inc/pervasive.sh
+++ b/upgrade/inc/pervasive.sh
@@ -5,10 +5,10 @@ MYSQL='mysql -u admin '
 
 set -e
 
-#if [ "$UID" != 0 ]; then
-#    echo "has to be run as root"
-#    exit 1
-#fi
+if [ "$UID" != 0 ]; then
+    echo "has to be run as root"
+    exit 1
+fi
 
 if [[ -n "${DBPREFIX}" ]]; then
     echo "Using non-default database ${DBPREFIX}x4dat."