diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 14:54:47 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 14:54:47 +0200 |
| commit | 5514b1069968d451adb7eaf89278a6e1e5dc20df (patch) | |
| tree | 245b21642c134c4509e46fab60d130065e123624 /travis/check-executable-files.sh | |
| parent | 93621aa1844ab48d9bae068d9872d2c49ae86de4 (diff) | |
| parent | ca5678cc1c2a1f723d39127e0c066eba6c9a3336 (diff) | |
| download | forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.gz forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.bz2 forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.xz forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.zip | |
Merge pull request #4960 from rxu/ticket/15367
[ticket/15367] Escape special characters in Sphinx search backend
Diffstat (limited to 'travis/check-executable-files.sh')
| -rwxr-xr-x | travis/check-executable-files.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh index 4d420add1c..1aa8dca073 100755 --- a/travis/check-executable-files.sh +++ b/travis/check-executable-files.sh @@ -12,10 +12,11 @@ set -e DB=$1 TRAVIS_PHP_VERSION=$2 -root="$3" +NOTESTS=$3 +root="$4" path="${root}phpBB/" -if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] +if [ "$NOTESTS" == '1' ] then # Check the permissions of the files @@ -27,7 +28,7 @@ then files_skipped="-false" # Files which have to be executable - executable_files="-path ${path}bin/*" + executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php" incorrect_files=$( \ find ${path} \ |