From 4c672a7ada7f65dd3dc58951c28f742cc96670cd Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 11 Aug 2018 12:08:13 +0200 Subject: [PATCH] Update travis build script --- Hooks/travis.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Hooks/travis.sh b/Hooks/travis.sh index 4a5ce90..b37f5ee 100644 --- a/Hooks/travis.sh +++ b/Hooks/travis.sh @@ -5,7 +5,6 @@ . ${rootpath}/Build/Hooks/filename.sh . ${rootpath}/Build/Hooks/tests.sh -set -e rootpath="$(pwd)" echo $rootpath @@ -26,7 +25,7 @@ echo $rootpath fi if [[ "$FILE" =~ ^.+(js)$ ]] && [[ $(hasJsLogging "$FILE") = 1 ]]; then - echo -e "\e[1;33m\tWarning, the commit contains a call to console.log() in '$1'. Commit was not aborted, however.\e[0m" >&2 + echo -e "\e[1;33m\tWarning, the commit contains a call to console.log() in '$FILE'. Commit was not aborted, however.\e[0m" >&2 fi # Tests @@ -69,14 +68,14 @@ echo $rootpath GEN_SYNTAX=$(hasInvalidBasicSyntax "$FILE") if [[ $GEN_SYNTAX = 1 ]]; then - echo -e "\e[1;31m\tFound whitespace at end of line in $1.\e[0m" >&2 - grep -P ' $' $1 >&2 + echo -e "\e[1;31m\tFound whitespace at end of line in $FILE.\e[0m" >&2 + grep -P ' $' $FILE >&2 exit 1 fi if [[ $GEN_SYNTAX = 2 ]]; then - echo -e "\e[1;31m\tFound tab instead of whitespace $1.\e[0m" >&2 - grep -P '\t' $1 >&2 + echo -e "\e[1;31m\tFound tab instead of whitespace $FILE.\e[0m" >&2 + grep -P '\t' $FILE >&2 exit 1 fi fi @@ -123,6 +122,4 @@ echo $rootpath grep -P '(\|\|\|\)[0-9a-zA-Z\.\?]+' "$FILE" >&2 fi fi -done - -exit 0 \ No newline at end of file +done \ No newline at end of file