1 files changed, 16 insertions, 38 deletions
diff --git a/build/integration/run.sh b/build/integration/run.sh
index 145415fd079..ff5efe0c3ec 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -1,31 +1,13 @@
 #!/usr/bin/env bash
 
-COMPOSER=$(which composer)
+composer install
+
+OC_PATH=../../
+OCC=${OC_PATH}occ
 
 SCENARIO_TO_RUN=$1
 HIDE_OC_LOGS=$2
 
-if [ -x "$COMPOSER" ]; then
-	echo "Using composer executable $COMPOSER"
-else
-	echo "Could not find composer executable" >&2
-	exit 1
-fi
-
-INSTALLED=$(../../occ status | grep installed: | cut -d " " -f 5)
-
-if [ "$INSTALLED" == "true" ]; then
-    # Disable bruteforce protection because the integration tests do trigger them
-    ../../occ config:system:set auth.bruteforce.protection.enabled --value false --type bool
-else
-    if [ "$SCENARIO_TO_RUN" != "setup_features/setup.feature" ]; then
-        echo "Nextcloud instance needs to be installed" >&2
-        exit 1
-    fi
-fi
-
-composer install
-
 # avoid port collision on jenkins - use $EXECUTOR_NUMBER
 if [ -z "$EXECUTOR_NUMBER" ]; then
     EXECUTOR_NUMBER=0
@@ -45,34 +27,30 @@ echo $PHPPID_FED
 export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
 
-if [ "$INSTALLED" == "true" ]; then
-    #Enable external storage app
-    ../../occ app:enable files_external
+#Enable external storage app
+$OCC app:enable files_external
 
-    mkdir -p work/local_storage
-    OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage`
+mkdir -p work/local_storage
+OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage`
 
-    ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
+ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}`
 
-    ../../occ files_external:option $ID_STORAGE enable_sharing true
-fi
+$OCC files_external:option $ID_STORAGE enable_sharing true
 
-vendor/bin/behat -f junit -f pretty $SCENARIO_TO_RUN
+vendor/bin/behat --strict -f junit -f pretty $SCENARIO_TO_RUN
 RESULT=$?
 
 kill $PHPPID
 kill $PHPPID_FED
 
-if [ "$INSTALLED" -eq "true" ]; then
-    ../../occ files_external:delete -y $ID_STORAGE
+$OCC files_external:delete -y $ID_STORAGE
 
-    #Disable external storage app
-    ../../occ app:disable files_external
-fi
+#Disable external storage app
+$OCC app:disable files_external
 
 if [ -z $HIDE_OC_LOGS ]; then
-	tail "../../data/nextcloud.log"
+	tail "${OC_PATH}/data/owncloud.log"
 fi
 
+echo "runsh: Exit code: $RESULT"
 exit $RESULT
-