From 079f1e2f41c8eb221dc4072d7ac558c4ff77f773 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 7 Aug 2014 13:58:42 +0200 Subject: [ticket/12693] Fix composer.phar path PHPBB3-12693 --- travis/check-executable-files.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'travis/check-executable-files.sh') diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index 4af974751e..1d8b33d327 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -9,12 +9,13 @@ # the docs/CREDITS.txt file. # set -e -set -x + DB=$1 TRAVIS_PHP_VERSION=$2 -path="$3" +root="$3" +path="${root}phpBB/" -if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] then # Check the permissions of the files @@ -26,7 +27,7 @@ then files_skipped="-false" # Files which have to be executable - executable_files="-path ${path}bin/* -o -path ${path}composer.phar" + executable_files="-path ${path}bin/* -o -path ${root}composer.phar" incorrect_files=$( \ find ${path} \ @@ -60,8 +61,8 @@ then if [ "${incorrect_files}" != '' ] then + echo "The following files do not have proper permissions:"; ls -la ${incorrect_files} - echo "does not have the proper permissions."; exit 1; fi fi -- cgit v1.2.1