Only uses autoload to require validation classes.

[platal.git] / upgrade / inc / pervasive.sh

diff --git a/upgrade/inc/pervasive.sh b/upgrade/inc/pervasive.sh
index 94cb23b..bc369ce 100755 (executable)
--- a/upgrade/inc/pervasive.sh
+++ b/upgrade/inc/pervasive.sh
@@ -41,7 +41,19 @@ function mysql_pipe() {
 function mysql_exec() {
     echo -n " * executing $1 "
     if [[ -z "${DRY_RUN}" ]]; then
-        (echo $1 | mysql_pipe) || die "ERROR"
+        (echo "$1" | mysql_pipe) || die "ERROR"
+    fi
+    echo "OK"
+}
+
+function mysql_pipe_nodb() {
+    sed -e "s/#\([0-9a-z]*\)#/${DBPREFIX}\1/g" | $MYSQL
+}
+
+function mysql_exec_nodb() {
+    echo -n " * executing $1 "
+    if [[ -z "${DRY_RUN}" ]]; then
+        (echo "$1" | mysql_pipe_nodb) || die "ERROR"
     fi
     echo "OK"
 }
@@ -49,7 +61,7 @@ function mysql_exec() {
 function mysql_run() {
     echo -n " * running $1 "
     if [[ -z "${DRY_RUN}" ]]; then
-        (cat $1 | mysql_pipe) || die "ERROR"
+        (cat "$1" | mysql_pipe) || die "ERROR"
     fi
     echo "OK"
 }