aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicofuma <github@nicofuma.fr>2015-05-04 22:53:21 +0200
committerNicofuma <github@nicofuma.fr>2015-05-04 22:53:21 +0200
commitba53901ffb734995b42626a71a81a5abaa55f85d (patch)
tree7fd40d755c23fbec1fd482dabbcee558794440e3
parent6be8841a5732009e28c2362b197e4492c6ea8aa7 (diff)
parentab3e4b8abc393d497ade2a7b5c6d3fbf747de5c1 (diff)
downloadforums-ba53901ffb734995b42626a71a81a5abaa55f85d.tar
forums-ba53901ffb734995b42626a71a81a5abaa55f85d.tar.gz
forums-ba53901ffb734995b42626a71a81a5abaa55f85d.tar.bz2
forums-ba53901ffb734995b42626a71a81a5abaa55f85d.tar.xz
forums-ba53901ffb734995b42626a71a81a5abaa55f85d.zip
Merge branch '3.1.x'
-rwxr-xr-xtravis/check-image-icc-profiles.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh
index d10c4cac40..df13c5f4e2 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" -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