From b7b0f4780c0e229bd6fea7e0d9f00da0c7c93607 Mon Sep 17 00:00:00 2001 From: Sergio Bertolin Date: Wed, 10 Aug 2016 07:26:35 +0000 Subject: Run as current user --- build/integration/run.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'build/integration/run.sh') diff --git a/build/integration/run.sh b/build/integration/run.sh index be2e7684dc6..671ca7b9578 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -36,13 +36,11 @@ echo $PHPPID_FED export TEST_SERVER_URL="http://localhost:$PORT/ocs/" export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/" -APACHE_USER=`ps -ef | egrep '(httpd|apache2|apache)' | grep -v \`whoami\` | grep -v root | head -n1 | awk '{print $1}'` - -OUTPUT_CREATE_STORAGE=`sudo -u $APACHE_USER ../../occ files_external:create local_storage local null::null -c datadir=./build/integration/local_storage` +OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null::null -c datadir=./build/integration/local_storage` ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}` -sudo -u $APACHE_USER ../../occ files_external:option $ID_STORAGE enable_sharing true +../../occ files_external:option $ID_STORAGE enable_sharing true vendor/bin/behat -f junit -f pretty $SCENARIO_TO_RUN RESULT=$? @@ -50,7 +48,7 @@ RESULT=$? kill $PHPPID kill $PHPPID_FED -sudo -u $APACHE_USER ../../occ files_external:delete -y $ID_STORAGE +../../occ files_external:delete -y $ID_STORAGE if [ -z $HIDE_OC_LOGS ]; then tail "../../data/nextcloud.log" -- cgit v1.2.3