diff --git a/drydocker/generic_js_lint.sh b/drydocker/generic_js_lint.sh index d57c9bc..27d169f 100644 --- a/drydocker/generic_js_lint.sh +++ b/drydocker/generic_js_lint.sh @@ -1,51 +1,51 @@ #!/bin/bash function generic_js_lint { retval=0 while read file; do if [ -z "${file}" -o ! -f "${file}" ]; then continue fi echo "Linting '$file' ... " >&3 java -jar /srv/closure-compiler.git/build/compiler.jar \ --language_in="ECMASCRIPT3" "${file}" >/dev/null retval=$(( ${retval} + $? )) >&3 uglifyjs "${file}" >/dev/null 2>&1 retval=$(( ${retval} + $? )) >&3 - done <<<"$(find . -type f -name "*.js" ! -name "*.min.js" | sort )" + done <<<"$(find . -type f -name "*.js" ! -name "*.min.js" ! -path "*viewer/*" | sort )" if [ ${retval} -ne 0 ]; then if [ "$(git rev-parse HEAD)" == "${parent_commit}" ]; then return ${retval} else current_commit=$(git rev-parse HEAD) parent_commit=$(git rev-list --parents -n 1 ${current_commit} | awk '{print $2}') export current_commit export parent_commit git checkout ${parent_commit} retval2=$(_shell generic_js_lint) if [ ${retval2} -lt ${retval} ]; then retval=$(( ${retval} - ${retval2} )) elif [ ${retval2} -eq ${retval} ]; then retval=0 else retval=0 fi git checkout ${current_commit} return ${retval} fi fi return ${retval} }