mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12693] Fix composer.phar path [ticket/12693] The files skipped list can not be empty [ticket/12693] Force the composer.phar to be executable [ticket/12693] All the files in bin/ must be executable [ticket/12693] Expand manually the wildcard [ticket/12693] Fix the query for bin/* [ticket/12693] Extract exceptions, bin/* must be executable [ticket/12693] Remove the executable bit on icon_print.gif [ticket/12693] Check the persmissions of the owner [ticket/12693] Check if the are executable and not if they are 644 [ticket/12693] Fix the permissions [ticket/12693] Check if the files have the right 644 [ticket/12693] Fix indentation [ticket/12693] Add a travis test that checks file permissions
This commit is contained in:
commit
19746b8fc2
3 changed files with 69 additions and 0 deletions
|
@ -38,6 +38,7 @@ before_script:
|
||||||
script:
|
script:
|
||||||
- travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
|
- travis/phing-sniff.sh $DB $TRAVIS_PHP_VERSION
|
||||||
- travis/check-image-icc-profiles.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/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
|
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
|
||||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
|
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
|
||||||
|
|
||||||
|
|
0
phpBB/styles/prosilver/theme/images/icon_print.gif
Executable file → Normal file
0
phpBB/styles/prosilver/theme/images/icon_print.gif
Executable file → Normal file
Before Width: | Height: | Size: 204 B After Width: | Height: | Size: 204 B |
68
travis/check-executable-files.sh
Executable file
68
travis/check-executable-files.sh
Executable file
|
@ -0,0 +1,68 @@
|
||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# This file is part of the phpBB Forum Software package.
|
||||||
|
#
|
||||||
|
# @copyright (c) phpBB Limited <https://www.phpbb.com>
|
||||||
|
# @license GNU General Public License, version 2 (GPL-2.0)
|
||||||
|
#
|
||||||
|
# For full copyright and license information, please see
|
||||||
|
# the docs/CREDITS.txt file.
|
||||||
|
#
|
||||||
|
set -e
|
||||||
|
|
||||||
|
DB=$1
|
||||||
|
TRAVIS_PHP_VERSION=$2
|
||||||
|
root="$3"
|
||||||
|
path="${root}phpBB/"
|
||||||
|
|
||||||
|
if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ]
|
||||||
|
then
|
||||||
|
# Check the permissions of the files
|
||||||
|
|
||||||
|
# The following variables MUST NOT contain any wildcard
|
||||||
|
# Directories to skip
|
||||||
|
directories_skipped="-path ${path}develop -o -path ${path}vendor"
|
||||||
|
|
||||||
|
# Files to skip
|
||||||
|
files_skipped="-false"
|
||||||
|
|
||||||
|
# Files which have to be executable
|
||||||
|
executable_files="-path ${path}bin/* -o -path ${root}composer.phar"
|
||||||
|
|
||||||
|
incorrect_files=$( \
|
||||||
|
find ${path} \
|
||||||
|
'(' \
|
||||||
|
'(' \
|
||||||
|
${directories_skipped} \
|
||||||
|
')' \
|
||||||
|
-a -type d -prune -a -type f \
|
||||||
|
')' -o \
|
||||||
|
'(' \
|
||||||
|
-type f -a \
|
||||||
|
-not '(' \
|
||||||
|
${files_skipped} \
|
||||||
|
')' -a \
|
||||||
|
'(' \
|
||||||
|
'(' \
|
||||||
|
'(' \
|
||||||
|
${executable_files} \
|
||||||
|
')' -a \
|
||||||
|
-not -perm +100 \
|
||||||
|
')' -o \
|
||||||
|
'(' \
|
||||||
|
-not '(' \
|
||||||
|
${executable_files} \
|
||||||
|
')' -a \
|
||||||
|
-perm +111 \
|
||||||
|
')' \
|
||||||
|
')' \
|
||||||
|
')' \
|
||||||
|
)
|
||||||
|
|
||||||
|
if [ "${incorrect_files}" != '' ]
|
||||||
|
then
|
||||||
|
echo "The following files do not have proper permissions:";
|
||||||
|
ls -la ${incorrect_files}
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
fi
|
Loading…
Add table
Reference in a new issue