[Pkg-owncloud-commits] [owncloud] 95/123: Store in array to allow paths with whitespace

David Prévot taffit at moszumanska.debian.org
Tue May 19 23:55:21 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 89b0bc1915594256098461ad70ff75ea6f395a96
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Fri May 15 13:16:16 2015 +0200

    Store in array to allow paths with whitespace
---
 autotest.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/autotest.sh b/autotest.sh
index d34bd48..3ce88c6 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -55,9 +55,9 @@ fi
 
 # PHPUnit might also be installed via a facade binary script
 if [[ "$PHPUNIT" =~ \.phar$ ]]; then
-  PHPUNIT="$PHP $PHPUNIT"
+  PHPUNIT=( "$PHP" "$PHPUNIT" )
 else
-  PHPUNIT="$PHPUNIT"
+  PHPUNIT=( "$PHPUNIT" )
 fi
 
 PHPUNIT_VERSION=$($PHPUNIT --version | cut -d" " -f2)
@@ -167,11 +167,11 @@ function execute_tests {
 	mkdir "coverage-html-$1"
 	"$PHP" -f enable_all.php | grep -i -C9999 error && echo "Error during setup" && exit 101
 	if [ -z "$NOCOVERAGE" ]; then
-		$PHPUNIT --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" --coverage-clover "autotest-clover-$1.xml" --coverage-html "coverage-html-$1" "$2" "$3"
+		"${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" --coverage-clover "autotest-clover-$1.xml" --coverage-html "coverage-html-$1" "$2" "$3"
 		RESULT=$?
 	else
 		echo "No coverage"
-		$PHPUNIT --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3"
+		"${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3"
 		RESULT=$?
 	fi
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list