From 3d7e7d1073335cc9035eb5c500bc6775aa927377 Mon Sep 17 00:00:00 2001 From: Lucas Gravley <29484535+admiralAwkbar@users.noreply.github.com> Date: Wed, 5 Aug 2020 14:28:43 -0500 Subject: [PATCH] Fix checkstyle --- Dockerfile | 2 +- lib/linter.sh | 2 +- lib/worker.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4140b57..5adfa969 100644 --- a/Dockerfile +++ b/Dockerfile @@ -215,7 +215,7 @@ RUN CHECKSTYLE_LATEST=$(curl -s https://api.github.com/repos/checkstyle/checksty | grep ".jar" \ | cut -d '"' -f 4) \ && curl -sSL $CHECKSTYLE_LATEST \ - --output /usr/bin/checkstyle.jar + --output /usr/bin/checkstyle #################### # Install luacheck # diff --git a/lib/linter.sh b/lib/linter.sh index db084878..e18dbe67 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -1415,7 +1415,7 @@ if [ "$VALIDATE_JAVA" == "true" ]; then # Lint the JAVA files # ####################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "JAVA" "checkstyle" "java -jar /usr/bin/checksytle.jar -c ${JAVA_LINTER_RULES}" ".*\.\(java\)\$" "${FILE_ARRAY_JAVA[@]}" + LintCodebase "JAVA" "checkstyle" "java -jar checksytle -c ${JAVA_LINTER_RULES}" ".*\.\(java\)\$" "${FILE_ARRAY_JAVA[@]}" fi ###################### diff --git a/lib/worker.sh b/lib/worker.sh index ba7d9f15..ce0b9d12 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -583,7 +583,7 @@ function RunTestCases() { TestCodebase "GO" "golangci-lint" "golangci-lint run -c ${GO_LINTER_RULES}" ".*\.\(go\)\$" "golang" TestCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES --failon error" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "groovy" TestCodebase "HTML" "htmlhint" "htmlhint --config ${HTML_LINTER_RULES}" ".*\.\(html\)\$" "html" - TestCodebase "JAVA" "checkstyle" "java -jar /usr/bin/checksytle.jar -c ${JAVA_LINTER_RULES}" ".*\.\(java\)\$" "java" + TestCodebase "JAVA" "checkstyle" "java -jar checksytle -c ${JAVA_LINTER_RULES}" ".*\.\(java\)\$" "java" TestCodebase "JAVASCRIPT_ES" "eslint" "eslint --no-eslintrc -c ${JAVASCRIPT_LINTER_RULES}" ".*\.\(js\)\$" "javascript" TestCodebase "JAVASCRIPT_STANDARD" "standard" "standard ${JAVASCRIPT_STANDARD_LINTER_RULES}" ".*\.\(js\)\$" "javascript" TestCodebase "JSON" "jsonlint" "jsonlint" ".*\.\(json\)\$" "json"