Skip to content

Commit ddfa762

Browse files
hiroyuki-satohiroyuki-sato
authored
GH-46496: [CI][Dev] Fix shellcheck SC2086 errors in ci/scripts directory (#46497)
### Rationale for this change We are trying to implement shellcheck on all sh files in #44748. ### What changes are included in this PR? SC2086 check requires quoting like `${url}` -> `"${url}"`. ### Are these changes tested? Yes. ### Are there any user-facing changes? No. * GitHub Issue: #46496 Authored-by: Hiroyuki Sato <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent 719be48 commit ddfa762

18 files changed

+72
-55
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,30 @@ repos:
196196
?^ci/scripts/c_glib_build\.sh$|
197197
?^ci/scripts/c_glib_test\.sh$|
198198
?^ci/scripts/conan_setup\.sh$|
199+
?^ci/scripts/csharp_build\.sh$|
200+
?^ci/scripts/csharp_pack\.sh$|
199201
?^ci/scripts/download_tz_database\.sh$|
200202
?^ci/scripts/install_azurite\.sh$|
201203
?^ci/scripts/install_ccache\.sh$|
202204
?^ci/scripts/install_ceph\.sh$|
205+
?^ci/scripts/install_chromedriver\.sh$|
206+
?^ci/scripts/install_cmake\.sh$|
207+
?^ci/scripts/install_emscripten\.sh$|
208+
?^ci/scripts/install_iwyu\.sh$|
209+
?^ci/scripts/install_ninja\.sh$|
210+
?^ci/scripts/install_numpy\.sh$|
211+
?^ci/scripts/install_pandas\.sh$|
212+
?^ci/scripts/install_python\.sh$|
203213
?^ci/scripts/install_spark\.sh$|
214+
?^ci/scripts/install_vcpkg\.sh$|
204215
?^ci/scripts/integration_dask\.sh$|
216+
?^ci/scripts/matlab_build\.sh$|
217+
?^ci/scripts/msys2_system_clean\.sh$|
205218
?^ci/scripts/msys2_system_upgrade\.sh$|
219+
?^ci/scripts/python_sdist_build\.sh$|
220+
?^ci/scripts/release_test\.sh$|
221+
?^ci/scripts/ruby_test\.sh$|
222+
?^ci/scripts/rust_build\.sh$|
206223
?^ci/scripts/util_free_space\.sh$|
207224
?^cpp/build-support/build-lz4-lib\.sh$|
208225
?^cpp/build-support/build-zstd-lib\.sh$|

‎ci/scripts/csharp_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ set -ex
2121

2222
source_dir=${1}/csharp
2323

24-
pushd ${source_dir}
24+
pushd "${source_dir}"
2525
dotnet build
2626
popd

‎ci/scripts/csharp_pack.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ set -eux
2121

2222
source_dir=${1}/csharp
2323

24-
pushd ${source_dir}
24+
pushd "${source_dir}"
2525
dotnet pack -c Release
2626
popd

‎ci/scripts/install_chromedriver.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set -e
2323

2424
chrome_version=$1
2525

26-
if [ $chrome_version = "latest" ]; then
26+
if [ "$chrome_version" = "latest" ]; then
2727
latest_release_path=LATEST_RELEASE_STABLE
2828
else
2929
latest_release_path=LATEST_RELEASE_${chrome_version}

‎ci/scripts/install_cmake.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ archs=([x86_64]=x86_64
3030
[aarch64]=aarch64)
3131

3232
arch=$(uname -m)
33-
if [ -z ${archs[$arch]} ]; then
33+
if [ -z "${archs[$arch]}" ]; then
3434
echo "Unsupported architecture: ${arch}"
3535
exit 0
3636
fi
@@ -56,25 +56,25 @@ case ${platform} in
5656
;;
5757
esac
5858

59-
mkdir -p ${prefix}
59+
mkdir -p "${prefix}"
6060
url="https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-${platform}-"
6161
case ${platform} in
6262
macos)
6363
url+="universal.tar.gz"
64-
curl -L ${url} | tar -xzf - --directory ${prefix} --strip-components=1
65-
ln -s CMake.app/Contents/bin ${prefix}/bin
64+
curl -L "${url}" | tar -xzf - --directory "${prefix}" --strip-components=1
65+
ln -s CMake.app/Contents/bin "${prefix}/bin"
6666
;;
6767
windows)
6868
url+="${arch}.zip"
69-
archive_name=$(basename ${url})
70-
curl -L -o ${archive_name} ${url}
71-
unzip ${archive_name}
72-
base_name=$(basename ${archive_name} .zip)
73-
mv ${base_name}/* ${prefix}
74-
rm -rf ${base_name} ${archive_name}
69+
archive_name=$(basename "${url}")
70+
curl -L -o "${archive_name}" "${url}"
71+
unzip "${archive_name}"
72+
base_name=$(basename "${archive_name}" .zip)
73+
mv "${base_name}"/* "${prefix}"
74+
rm -rf "${base_name}" "${archive_name}"
7575
;;
7676
*)
7777
url+="${arch}.tar.gz"
78-
curl -L ${url} | tar -xzf - --directory ${prefix} --strip-components=1
78+
curl -L "${url}" | tar -xzf - --directory "${prefix}" --strip-components=1
7979
;;
8080
esac

‎ci/scripts/install_emscripten.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ set -e
2424
target_path=$1
2525
pyodide_path=$2
2626

27-
emscripten_version=$(${pyodide_path}/python -c "import sys;print(*sys._emscripten_info.emscripten_version,sep='.')")
27+
emscripten_version=$("${pyodide_path}/python" -c "import sys;print(*sys._emscripten_info.emscripten_version,sep='.')")
2828

29-
cd ${target_path}
29+
cd "${target_path}"
3030
if [ ! -d emsdk ]; then
3131
git clone https://github.com/emscripten-core/emsdk.git
3232
fi
3333
cd emsdk
34-
./emsdk install ${emscripten_version}
35-
./emsdk activate ${emscripten_version}
36-
echo "Installed emsdk to: ${target_path}"
34+
./emsdk install "${emscripten_version}"
35+
./emsdk activate "${emscripten_version}"
36+
echo "Installed emsdk to: ${target_path}"

‎ci/scripts/install_iwyu.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,26 @@ install_prefix=${2:-/usr/local}
2323
clang_tools_version=${3:-8}
2424

2525
iwyu_branch_name="clang_${clang_tools_version}"
26-
if [ ${clang_tools_version} -lt 10 ]; then
26+
if [ "${clang_tools_version}" -lt 10 ]; then
2727
iwyu_branch_name="${iwyu_branch_name}.0"
2828
fi
2929

30-
git clone --single-branch --branch ${iwyu_branch_name} \
31-
https://github.com/include-what-you-use/include-what-you-use.git ${source_dir}
30+
git clone --single-branch --branch "${iwyu_branch_name}" \
31+
https://github.com/include-what-you-use/include-what-you-use.git "${source_dir}"
3232

33-
mkdir -p ${source_dir}/build
34-
pushd ${source_dir}/build
33+
mkdir -p "${source_dir}/build"
34+
pushd "${source_dir}/build"
3535

3636
# Build IWYU for current Clang
3737
export CC=clang-${clang_tools_version}
3838
export CXX=clang++-${clang_tools_version}
3939

40-
cmake -DCMAKE_PREFIX_PATH=/usr/lib/llvm-${clang_tools_version} \
41-
-DCMAKE_INSTALL_PREFIX=${install_prefix} \
42-
${source_dir}
40+
cmake -DCMAKE_PREFIX_PATH="/usr/lib/llvm-${clang_tools_version}" \
41+
-DCMAKE_INSTALL_PREFIX="${install_prefix}" \
42+
"${source_dir}"
4343
make -j4
4444
make install
4545

4646
popd
4747

48-
rm -rf ${source_dir}
48+
rm -rf "${source_dir}"

‎ci/scripts/install_ninja.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ prefix=$2
3030
url="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz"
3131

3232
mkdir /tmp/ninja
33-
wget -q ${url} -O - | tar -xzf - --directory /tmp/ninja --strip-components=1
33+
wget -q "${url}" -O - | tar -xzf - --directory /tmp/ninja --strip-components=1
3434

3535
pushd /tmp/ninja
3636
./configure.py --bootstrap
37-
mv ninja ${prefix}/bin
37+
mv ninja "${prefix}/bin"
3838
popd
3939

4040
rm -rf /tmp/ninja

‎ci/scripts/install_numpy.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ numpy=${1:-"latest"}
2929
if [ "${numpy}" = "latest" ]; then
3030
pip install numpy
3131
else
32-
pip install numpy==${numpy}
32+
pip install numpy=="${numpy}"
3333
fi

‎ci/scripts/install_pandas.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if [ "${numpy}" = "nightly" ]; then
3232
elif [ "${numpy}" = "latest" ]; then
3333
pip install numpy
3434
else
35-
pip install numpy==${numpy}
35+
pip install numpy=="${numpy}"
3636
fi
3737

3838
if [ "${pandas}" = "upstream_devel" ]; then
@@ -42,5 +42,5 @@ elif [ "${pandas}" = "nightly" ]; then
4242
elif [ "${pandas}" = "latest" ]; then
4343
pip install pandas
4444
else
45-
pip install pandas==${pandas}
45+
pip install pandas=="${pandas}"
4646
fi

0 commit comments

Comments
 (0)