Make phpBB installer more friendly for restricted envs.

[wizard.git] / tests / setup

diff --git a/tests/setup b/tests/setup
index 699a5b9b5fb4effd62f48268030180b29287382e..5ad70ccbad46267174b50604b9f51635a5bc6e07 100644 (file)
--- a/tests/setup
+++ b/tests/setup
@@ -6,15 +6,24 @@
 
 VERSION="$1"
 if [ "$VERSION" == "" ]; then
-    echo "Must specify version"
-    exit 1
+    if [ "$DEFAULT_HEAD" == "1" ]; then
+        VERSION="head"
+    else
+        echo "Must specify version"
+        exit 1
+    fi
 fi
 
 UVERSION=`echo "$VERSION" | sed s/[-.]/_/g`
 TESTID="${TESTNAME}_$UVERSION"
+echo "$TESTID"
 TESTDIR="testdir_${TESTNAME}_$VERSION"
-export WIZARD_ADMIN_NAME="admin"
-export WIZARD_ADMIN_PASSWORD="wizard"
+if [ "$WIZARD_ADMIN_NAME" == "" ]; then
+    export WIZARD_ADMIN_NAME="admin"
+fi
+if [ "$WIZARD_ADMIN_PASSWORD" == "" ]; then
+    export WIZARD_ADMIN_PASSWORD="wizard"
+fi
 
 if [ -e "config" ]; then
     source ./config
@@ -22,6 +31,10 @@ fi
 
 if [ -e "$TESTDIR" ]; then
     echo "Removing previous $TESTDIR folder..."
-    rm -Rf "$TESTDIR"
+    wizard remove "$TESTDIR" || rm -Rf "$TESTDIR"
+fi
+
+if [ -e "prepare" ]; then
+    source ./prepare
 fi