From acaa10de529408ba9ca366d021fc1f1bc4bdf904 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 28 Apr 2015 13:12:48 -0700 Subject: [ticket/13516] Do not search ICC profiles in extension vendors PHPBB3-13516 --- travis/check-image-icc-profiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh index bb070ccc27..f526cce264 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 -not -path './phpBB/*' -iregex '(vendor\|ext/vendor/).*\.\(gif\|jpg\|jpeg\|png\)$' | \ parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' fi -- cgit v1.2.1 From 5a107d9dc1b5e11401caa7f3d7cafc4d4d0d4f7e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 4 May 2015 10:33:14 -0700 Subject: [ticket/13516] Update image search script PHPBB3-13516 --- travis/check-image-icc-profiles.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis') diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh index f526cce264..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/*' -iregex '(vendor\|ext/vendor/).*\.\(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 -- cgit v1.2.1