From 9c8fe0839648b841f7ebc97ade01fe24f4791079 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 26 Jun 2025 09:36:13 +0900 Subject: [PATCH 1/5] GH-46909: [CI][Dev] Fix shellcheck errors in the ci/scripts/install_sccache.sh --- .pre-commit-config.yaml | 1 + ci/scripts/install_sccache.sh | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 30f1eef0300..ad8aab4b229 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -325,6 +325,7 @@ repos: ?^ci/scripts/install_numpy\.sh$| ?^ci/scripts/install_pandas\.sh$| ?^ci/scripts/install_python\.sh$| + ?^ci/scripts/install_sccache\.sh$| ?^ci/scripts/install_spark\.sh$| ?^ci/scripts/install_vcpkg\.sh$| ?^ci/scripts/integration_arrow_build\.sh$| diff --git a/ci/scripts/install_sccache.sh b/ci/scripts/install_sccache.sh index 136f39b3ae2..4c7064da93a 100755 --- a/ci/scripts/install_sccache.sh +++ b/ci/scripts/install_sccache.sh @@ -19,7 +19,7 @@ set -e -if [ "$#" -lt 1 -o "$#" -gt 3 ]; then +if [ "$#" -lt 1 ] || [ "$#" -gt 3 ]; then echo "Usage: $0 " echo "Will default to version=0.3.0 " exit 1 @@ -39,8 +39,8 @@ SCCACHE_URL="https://github.com/mozilla/sccache/releases/download/v$VERSION/scca SCCACHE_ARCHIVE=sccache.tar.gz # Download archive and checksum -curl -L $SCCACHE_URL --output $SCCACHE_ARCHIVE -curl -L $SCCACHE_URL.sha256 --output $SCCACHE_ARCHIVE.sha256 +curl -L "$SCCACHE_URL" --output $SCCACHE_ARCHIVE +curl -L "${SCCACHE_URL}.sha256" --output $SCCACHE_ARCHIVE.sha256 echo " $SCCACHE_ARCHIVE" >> $SCCACHE_ARCHIVE.sha256 SHA_ARGS="--check --status" @@ -50,19 +50,19 @@ if sha256sum --version 2>&1 | grep -q BusyBox; then SHA_ARGS="-sc" fi -sha256sum $SHA_ARGS $SCCACHE_ARCHIVE.sha256 +sha256sum "$SHA_ARGS" $SCCACHE_ARCHIVE.sha256 -if [ ! -d $PREFIX ]; then - mkdir -p $PREFIX +if [ ! -d "$PREFIX" ]; then + mkdir -p "$PREFIX" fi # Extract only the sccache binary into $PREFIX and ignore README and LICENSE. # --wildcards doesn't work on busybox. -tar -xzvf $SCCACHE_ARCHIVE --strip-component=1 --directory $PREFIX --exclude="sccache*/*E*E*" -chmod a+x $PREFIX/sccache +tar -xzvf $SCCACHE_ARCHIVE --strip-component=1 --directory "$PREFIX" --exclude="sccache*/*E*E*" +chmod a+x "${PREFIX}/sccache" if [ -n "${GITHUB_PATH}" ]; then - echo "$PREFIX" >> $GITHUB_PATH + echo "$PREFIX" >> "$GITHUB_PATH" # Add executable for windows as mingw workaround. - echo "SCCACHE_PATH=$PREFIX/sccache.exe" >> $GITHUB_ENV + echo "SCCACHE_PATH=$PREFIX/sccache.exe" >> "$GITHUB_ENV" fi From d111442fa0f9625200248c4ccf7858c0d12c4917 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 26 Jun 2025 09:56:18 +0900 Subject: [PATCH 2/5] Use array arguments --- ci/scripts/install_sccache.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/scripts/install_sccache.sh b/ci/scripts/install_sccache.sh index 4c7064da93a..1e2d3f93b34 100755 --- a/ci/scripts/install_sccache.sh +++ b/ci/scripts/install_sccache.sh @@ -43,14 +43,14 @@ curl -L "$SCCACHE_URL" --output $SCCACHE_ARCHIVE curl -L "${SCCACHE_URL}.sha256" --output $SCCACHE_ARCHIVE.sha256 echo " $SCCACHE_ARCHIVE" >> $SCCACHE_ARCHIVE.sha256 -SHA_ARGS="--check --status" +SHA_ARGS=(--check --status) # Busybox sha256sum uses different flags if sha256sum --version 2>&1 | grep -q BusyBox; then - SHA_ARGS="-sc" + SHA_ARGS+=(-sc) fi -sha256sum "$SHA_ARGS" $SCCACHE_ARCHIVE.sha256 +sha256sum "${SHA_ARGS[@]}" $SCCACHE_ARCHIVE.sha256 if [ ! -d "$PREFIX" ]; then mkdir -p "$PREFIX" From 106aebc8f0770257efb95c132bd8fcff834ed856 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 26 Jun 2025 16:49:11 +0900 Subject: [PATCH 3/5] Change to two arguments mandatory --- ci/scripts/install_sccache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/install_sccache.sh b/ci/scripts/install_sccache.sh index 1e2d3f93b34..7f3840d0efd 100755 --- a/ci/scripts/install_sccache.sh +++ b/ci/scripts/install_sccache.sh @@ -19,7 +19,7 @@ set -e -if [ "$#" -lt 1 ] || [ "$#" -gt 3 ]; then +if [ "$#" -lt 2 ] || [ "$#" -gt 3 ]; then echo "Usage: $0 " echo "Will default to version=0.3.0 " exit 1 From 61da45ee70eedcef0e7736616a8e298bb3ea9b88 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 3 Jul 2025 10:22:41 +0900 Subject: [PATCH 4/5] Override SHA option --- ci/scripts/install_sccache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/install_sccache.sh b/ci/scripts/install_sccache.sh index 7f3840d0efd..e886d135e71 100755 --- a/ci/scripts/install_sccache.sh +++ b/ci/scripts/install_sccache.sh @@ -47,7 +47,7 @@ SHA_ARGS=(--check --status) # Busybox sha256sum uses different flags if sha256sum --version 2>&1 | grep -q BusyBox; then - SHA_ARGS+=(-sc) + SHA_ARGS="-sc" fi sha256sum "${SHA_ARGS[@]}" $SCCACHE_ARCHIVE.sha256 From 2b91057167196b8f608a3f931bc5a940cf8706b7 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 3 Jul 2025 11:59:41 +0900 Subject: [PATCH 5/5] Use array --- ci/scripts/install_sccache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/install_sccache.sh b/ci/scripts/install_sccache.sh index e886d135e71..c571625a3b3 100755 --- a/ci/scripts/install_sccache.sh +++ b/ci/scripts/install_sccache.sh @@ -47,7 +47,7 @@ SHA_ARGS=(--check --status) # Busybox sha256sum uses different flags if sha256sum --version 2>&1 | grep -q BusyBox; then - SHA_ARGS="-sc" + SHA_ARGS=(-sc) fi sha256sum "${SHA_ARGS[@]}" $SCCACHE_ARCHIVE.sha256