diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-07 13:58:42 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-07 14:00:43 +0200 |
| commit | 079f1e2f41c8eb221dc4072d7ac558c4ff77f773 (patch) | |
| tree | 195638988d740bcbe6947987a70bb28df07aa7a4 | |
| parent | 4328141fd28c08c6143c66697096f4decf7e1c01 (diff) | |
| download | forums-079f1e2f41c8eb221dc4072d7ac558c4ff77f773.tar forums-079f1e2f41c8eb221dc4072d7ac558c4ff77f773.tar.gz forums-079f1e2f41c8eb221dc4072d7ac558c4ff77f773.tar.bz2 forums-079f1e2f41c8eb221dc4072d7ac558c4ff77f773.tar.xz forums-079f1e2f41c8eb221dc4072d7ac558c4ff77f773.zip | |
[ticket/12693] Fix composer.phar path
PHPBB3-12693
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | travis/check-executable-files.sh | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 3bce6a01f1..49685e32a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ before_script: script: - travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION - travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION - - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION phpBB/ + - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" 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 |