From 8baec3bc77c9c4190818b66c029d7a2ad65e34e8 Mon Sep 17 00:00:00 2001 From: assignUser Date: Sat, 15 Aug 2020 23:43:42 +0000 Subject: [PATCH] fix --- lib/linter.sh | 2 +- lib/worker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/linter.sh b/lib/linter.sh index 048a5d6c..8a7efcfa 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -1699,7 +1699,7 @@ if [ "${VALIDATE_R}" == "true" ]; then # Lint the R files # ####################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "R" "lintr" "R --slave -e 'lintr::lint(" ".*\.\(r\|R\|Rmd\|rmd\)\$" "${FILE_ARRAY_R[@]}" + LintCodebase "R" "lintr" "${R_LINTER_RULES}" ".*\.\(r\|R\|Rmd\|rmd\)\$" "${FILE_ARRAY_R[@]}" fi ################ diff --git a/lib/worker.sh b/lib/worker.sh index d0a34ee5..c5f25012 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -215,7 +215,7 @@ function LintCodebase() { ####################################### LINT_CMD=$( cd "${GITHUB_WORKSPACE}" || exit - ${LINTER_COMMAND}"${DIR_NAME}/$FILE_NAME")' 2>&1 #' + R --slave -e "lintr::lint('${DIR_NAME}/$FILE_NAME')" 2>&1 ) else ################################