makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12693] Fix composer.phar path

Browse source 
PHPBB3-12693
This commit is contained in:
Tristan Darricau 2014-08-07 13:58:42 +02:00
parent 4328141fd2
commit 079f1e2f41
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -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"

11
travis/check-executable-files.sh
View file

@ -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