diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-04 22:52:28 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-04 22:52:28 +0200 |
| commit | ab3e4b8abc393d497ade2a7b5c6d3fbf747de5c1 (patch) | |
| tree | 7f7fb08af205cabf01dfa9a0aebdfe42da07fefb /travis | |
| parent | 0e7448e2b339ef1855428a00808afb0c55c996c5 (diff) | |
| parent | 5a107d9dc1b5e11401caa7f3d7cafc4d4d0d4f7e (diff) | |
| download | forums-ab3e4b8abc393d497ade2a7b5c6d3fbf747de5c1.tar forums-ab3e4b8abc393d497ade2a7b5c6d3fbf747de5c1.tar.gz forums-ab3e4b8abc393d497ade2a7b5c6d3fbf747de5c1.tar.bz2 forums-ab3e4b8abc393d497ade2a7b5c6d3fbf747de5c1.tar.xz forums-ab3e4b8abc393d497ade2a7b5c6d3fbf747de5c1.zip | |
Merge pull request #3564 from VSEphpbb/ticket/13516
[ticket/13516] Do not search ICC profiles in extension vendors
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/check-image-icc-profiles.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh index bb070ccc27..5926962d40 100755 --- a/travis/check-image-icc-profiles.sh +++ b/travis/check-image-icc-profiles.sh @@ -15,6 +15,6 @@ TRAVIS_PHP_VERSION=$2 if [ "$TRAVIS_PHP_VERSION" == "5.3.3" -a "$DB" == "mysqli" ] then - find . -type f -not -path './phpBB/vendor/*' -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' | \ + find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \ parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' fi |