aboutsummaryrefslogtreecommitdiffstats
path: root/travis/check-executable-files.sh
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-08-09 16:11:34 +0200
committerNils Adermann <naderman@naderman.de>2014-08-09 16:11:34 +0200
commit02801dee7c92d80705f64f3a1773cd39bc41a682 (patch)
tree2f9d03a67d2b4e13eb9396d594bb54495efb89ea /travis/check-executable-files.sh
parent56ca276dcf080972ad2c5ae411b37c392ffed24d (diff)
parent3f73d32c3073ed5ed9a61b99a6512021c817c78b (diff)
downloadforums-02801dee7c92d80705f64f3a1773cd39bc41a682.tar
forums-02801dee7c92d80705f64f3a1773cd39bc41a682.tar.gz
forums-02801dee7c92d80705f64f3a1773cd39bc41a682.tar.bz2
forums-02801dee7c92d80705f64f3a1773cd39bc41a682.tar.xz
forums-02801dee7c92d80705f64f3a1773cd39bc41a682.zip
Merge remote-tracking branch 'github-nicofuma/ticket/12693' into develop-ascraeus
* github-nicofuma/ticket/12693: [ticket/12693] Don't try to check the composer.phar file
Diffstat (limited to 'travis/check-executable-files.sh')
-rwxr-xr-xtravis/check-executable-files.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh
index 1d8b33d327..4d420add1c 100755
--- a/travis/check-executable-files.sh
+++ b/travis/check-executable-files.sh
@@ -27,7 +27,7 @@ then
files_skipped="-false"
# Files which have to be executable
- executable_files="-path ${path}bin/* -o -path ${root}composer.phar"
+ executable_files="-path ${path}bin/*"
incorrect_files=$( \
find ${path} \