aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-11-13 16:35:01 +0100
committerVincent Petry <pvince81@owncloud.com>2014-11-13 16:35:01 +0100
commitdfcf2059e1e3c6973e6956c17f68de66e780c8a1 (patch)
treeac20a2dd84b678b024ed1791e30e072a6a23f6d4
parentb564192ba2e7e90c3b59533064239a2e4d19c0b1 (diff)
parent19346f4a276503a1b0094569466df705ecd254d3 (diff)
downloadnextcloud-server-dfcf2059e1e3c6973e6956c17f68de66e780c8a1.tar.gz
nextcloud-server-dfcf2059e1e3c6973e6956c17f68de66e780c8a1.zip
Merge pull request #12157 from owncloud/fix-autotest-condition
this allows a non-existant config/config.php for starting the autotest.s...
-rwxr-xr-xautotest.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/autotest.sh b/autotest.sh
index 8edb5f3915a..83a20699d01 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -40,7 +40,7 @@ if ! [ $PHPUNIT_MAJOR_VERSION -gt 3 -o \( $PHPUNIT_MAJOR_VERSION -eq 3 -a $PHPUN
exit 4
fi
-if ! [ -w config -a -w config/config.php ]; then
+if ! [ \( -w config -a ! -f config/config.php \) -o \( -f config/config.php -a -w config/config.php \) ]; then
echo "Please enable write permissions on config and config/config.php" >&2
exit 1
fi