From 90394dddd9e6fae7a1aef5374a621fd97a238a83 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Mon, 3 Aug 2026 19:15:25 +0900 Subject: [PATCH] GH-50777: [CI][Dev] Fix shellcheck errors in the ci/scripts/r_test.sh --- .pre-commit-config.yaml | 1 + ci/scripts/r_test.sh | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d22e790230f..052eb8c7c20 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -344,6 +344,7 @@ repos: ?^ci/scripts/r_install_system_dependencies\.sh$| ?^ci/scripts/r_revdepcheck\.sh$| ?^ci/scripts/r_sanitize\.sh$| + ?^ci/scripts/r_test\.sh$| ?^ci/scripts/release_test\.sh$| ?^ci/scripts/ruby_test\.sh$| ?^ci/scripts/rust_build\.sh$| diff --git a/ci/scripts/r_test.sh b/ci/scripts/r_test.sh index 34bef3cc157..80e7d5dc429 100755 --- a/ci/scripts/r_test.sh +++ b/ci/scripts/r_test.sh @@ -18,15 +18,19 @@ set -ex -: ${R_BIN:=R} +: "${R_BIN:=R}" -source_dir=${1}/r +source_dir="${1}/r" -pushd ${source_dir} +pushd "${source_dir}" printenv if [ -n "${ARROW_PYTHON_VENV:-}" ]; then + # We don't need to follow this external file. + # See also: https://www.shellcheck.net/wiki/SC1091 + # + # shellcheck source=/dev/null . "${ARROW_PYTHON_VENV}/bin/activate" fi @@ -47,8 +51,8 @@ if [ "$ARROW_R_FORCE_TESTS" = "true" ]; then fi if [ "$ARROW_USE_PKG_CONFIG" != "false" ]; then - export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH} - export R_LD_LIBRARY_PATH=${LD_LIBRARY_PATH} + export LD_LIBRARY_PATH="${ARROW_HOME}/lib:${LD_LIBRARY_PATH}" + export R_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" fi export _R_CHECK_COMPILATION_FLAGS_KNOWN_="${_R_CHECK_COMPILATION_FLAGS_KNOWN_} ${ARROW_R_CXXFLAGS}" @@ -126,7 +130,7 @@ SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true') print(args) rcmdcheck::rcmdcheck(build_args = build_args, args = args, error_on = 'warning', check_dir = 'check', timeout = 3600)" -echo "$SCRIPT" | ${R_BIN} --no-save +echo "$SCRIPT" | "${R_BIN}" --no-save AFTER=$(ls -alh ~/) if [ "$NOT_CRAN" != "true" ] && [ "$BEFORE" != "$AFTER" ]; then