Skip to content

Commit 4605289

Browse files
GH-47088: [CI][Dev] Fix shellcheck errors in the ci/scripts/integration_arrow.sh (#47089)
### Rationale for this change This is the sub issue #44748. * SC2046: Quote this to prevent word splitting. * SC2086: Double quote to prevent globbing and word splitting. * SC2102: Ranges can only match single chars (mentioned due to duplicates). * SC2223: This default assignment may cause DoS due to globbing. Quote it. ``` ci/scripts/integration_arrow.sh In ci/scripts/integration_arrow.sh line 27: : ${ARROW_INTEGRATION_CPP:=ON} ^--------------------------^ SC2223 (info): This default assignment may cause DoS due to globbing. Quote it. In ci/scripts/integration_arrow.sh line 28: : ${ARROW_INTEGRATION_CSHARP:=ON} ^-----------------------------^ SC2223 (info): This default assignment may cause DoS due to globbing. Quote it. In ci/scripts/integration_arrow.sh line 30: : ${ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS:=cpp,csharp} ^-- SC2223 (info): This default assignment may cause DoS due to globbing. Quote it. In ci/scripts/integration_arrow.sh line 33: . ${arrow_dir}/ci/scripts/util_log.sh ^----------^ SC2086 (info): Double quote to prevent globbing and word splitting. Did you mean: . "${arrow_dir}"/ci/scripts/util_log.sh In ci/scripts/integration_arrow.sh line 36: pip install -e $arrow_dir/dev/archery[integration] ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting. ^-----------^ SC2102 (info): Ranges can only match single chars (mentioned due to duplicates). Did you mean: pip install -e "$arrow_dir"/dev/archery[integration] In ci/scripts/integration_arrow.sh line 66: --with-cpp=$([ "$ARROW_INTEGRATION_CPP" == "ON" ] && echo "1" || echo "0") \ ^-- SC2046 (warning): Quote this to prevent word splitting. In ci/scripts/integration_arrow.sh line 67: --with-csharp=$([ "$ARROW_INTEGRATION_CSHARP" == "ON" ] && echo "1" || echo "0") \ ^-- SC2046 (warning): Quote this to prevent word splitting. In ci/scripts/integration_arrow.sh line 68: --gold-dirs=$gold_dir/0.14.1 \ ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting. Did you mean: --gold-dirs="$gold_dir"/0.14.1 \ In ci/scripts/integration_arrow.sh line 69: --gold-dirs=$gold_dir/0.17.1 \ ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting. Did you mean: --gold-dirs="$gold_dir"/0.17.1 \ In ci/scripts/integration_arrow.sh line 70: --gold-dirs=$gold_dir/1.0.0-bigendian \ ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting. Did you mean: --gold-dirs="$gold_dir"/1.0.0-bigendian \ In ci/scripts/integration_arrow.sh line 71: --gold-dirs=$gold_dir/1.0.0-littleendian \ ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting. Did you mean: --gold-dirs="$gold_dir"/1.0.0-littleendian \ In ci/scripts/integration_arrow.sh line 72: --gold-dirs=$gold_dir/2.0.0-compression \ ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting. Did you mean: --gold-dirs="$gold_dir"/2.0.0-compression \ In ci/scripts/integration_arrow.sh line 73: --gold-dirs=$gold_dir/4.0.0-shareddict \ ^-------^ SC2086 (info): Double quote to prevent globbing and word splitting. Did you mean: --gold-dirs="$gold_dir"/4.0.0-shareddict \ For more information: https://www.shellcheck.net/wiki/SC2046 -- Quote this to prevent word splitt... https://www.shellcheck.net/wiki/SC2086 -- Double quote to prevent globbing ... https://www.shellcheck.net/wiki/SC2102 -- Ranges can only match single char... ``` ### What changes are included in this PR? Quote variables. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #47088 Authored-by: Hiroyuki Sato <hiroysato@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent cf205ae commit 4605289

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ repos:
329329
?^ci/scripts/install_spark\.sh$|
330330
?^ci/scripts/install_vcpkg\.sh$|
331331
?^ci/scripts/integration_arrow_build\.sh$|
332+
?^ci/scripts/integration_arrow\.sh$|
332333
?^ci/scripts/integration_dask\.sh$|
333334
?^ci/scripts/integration_spark\.sh$|
334335
?^ci/scripts/matlab_build\.sh$|

ci/scripts/integration_arrow.sh

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ build_dir=${2}
2424

2525
gold_dir=$arrow_dir/testing/data/arrow-ipc-stream/integration
2626

27-
: ${ARROW_INTEGRATION_CPP:=ON}
28-
: ${ARROW_INTEGRATION_CSHARP:=ON}
27+
: "${ARROW_INTEGRATION_CPP:=ON}"
28+
: "${ARROW_INTEGRATION_CSHARP:=ON}"
2929

30-
: ${ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS:=cpp,csharp}
30+
: "${ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS:=cpp,csharp}"
3131
export ARCHERY_INTEGRATION_TARGET_IMPLEMENTATIONS
3232

33-
. ${arrow_dir}/ci/scripts/util_log.sh
33+
. "${arrow_dir}/ci/scripts/util_log.sh"
3434

3535
github_actions_group_begin "Integration: Prepare: Archery"
36-
pip install -e $arrow_dir/dev/archery[integration]
36+
pip install -e "$arrow_dir/dev/archery[integration]"
3737
github_actions_group_end
3838

3939
github_actions_group_begin "Integration: Prepare: Dependencies"
@@ -58,16 +58,19 @@ export PYTHONFAULTHANDLER=1
5858
export GOMEMLIMIT=200MiB
5959
export GODEBUG=gctrace=1,clobberfree=1
6060

61+
ARCHERY_WITH_CPP=$([ "$ARROW_INTEGRATION_CPP" == "ON" ] && echo "1" || echo "0")
62+
ARCHERY_WITH_CSHARP=$([ "$ARROW_INTEGRATION_CSHARP" == "ON" ] && echo "1" || echo "0")
63+
6164
# Rust can be enabled by exporting ARCHERY_INTEGRATION_WITH_RUST=1
6265
time archery integration \
6366
--run-c-data \
6467
--run-ipc \
6568
--run-flight \
66-
--with-cpp=$([ "$ARROW_INTEGRATION_CPP" == "ON" ] && echo "1" || echo "0") \
67-
--with-csharp=$([ "$ARROW_INTEGRATION_CSHARP" == "ON" ] && echo "1" || echo "0") \
68-
--gold-dirs=$gold_dir/0.14.1 \
69-
--gold-dirs=$gold_dir/0.17.1 \
70-
--gold-dirs=$gold_dir/1.0.0-bigendian \
71-
--gold-dirs=$gold_dir/1.0.0-littleendian \
72-
--gold-dirs=$gold_dir/2.0.0-compression \
73-
--gold-dirs=$gold_dir/4.0.0-shareddict \
69+
--with-cpp="${ARCHERY_WITH_CPP}" \
70+
--with-csharp="${ARCHERY_WITH_CSHARP}"\
71+
--gold-dirs="$gold_dir/0.14.1" \
72+
--gold-dirs="$gold_dir/0.17.1" \
73+
--gold-dirs="$gold_dir/1.0.0-bigendian" \
74+
--gold-dirs="$gold_dir/1.0.0-littleendian" \
75+
--gold-dirs="$gold_dir/2.0.0-compression" \
76+
--gold-dirs="$gold_dir/4.0.0-shareddict" \

0 commit comments

Comments
 (0)