Skip to content

Commit 03b21c5

Browse files
committed
GH-47244: [CI][Dev] Fix shellcheck errors in the ci/scripts/msys2_setup.sh
1 parent 596a60f commit 03b21c5

File tree

2 files changed

+37
-35
lines changed

2 files changed

+37
-35
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ repos:
334334
?^ci/scripts/integration_hdfs\.sh$|
335335
?^ci/scripts/integration_spark\.sh$|
336336
?^ci/scripts/matlab_build\.sh$|
337+
?^ci/scripts/msys2_setup\.sh$|
337338
?^ci/scripts/msys2_system_clean\.sh$|
338339
?^ci/scripts/msys2_system_upgrade\.sh$|
339340
?^ci/scripts/nanoarrow_build\.sh$|

ci/scripts/msys2_setup.sh

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,51 +24,51 @@ target=$1
2424
packages=()
2525
case "${target}" in
2626
cpp|c_glib|ruby)
27-
packages+=(${MINGW_PACKAGE_PREFIX}-aws-sdk-cpp)
28-
packages+=(${MINGW_PACKAGE_PREFIX}-boost)
29-
packages+=(${MINGW_PACKAGE_PREFIX}-brotli)
30-
packages+=(${MINGW_PACKAGE_PREFIX}-bzip2)
31-
packages+=(${MINGW_PACKAGE_PREFIX}-c-ares)
32-
packages+=(${MINGW_PACKAGE_PREFIX}-ccache)
33-
packages+=(${MINGW_PACKAGE_PREFIX}-clang)
34-
packages+=(${MINGW_PACKAGE_PREFIX}-cmake)
35-
packages+=(${MINGW_PACKAGE_PREFIX}-double-conversion)
36-
packages+=(${MINGW_PACKAGE_PREFIX}-gflags)
37-
packages+=(${MINGW_PACKAGE_PREFIX}-grpc)
38-
packages+=(${MINGW_PACKAGE_PREFIX}-gtest)
39-
packages+=(${MINGW_PACKAGE_PREFIX}-libutf8proc)
40-
packages+=(${MINGW_PACKAGE_PREFIX}-libxml2)
41-
packages+=(${MINGW_PACKAGE_PREFIX}-llvm)
42-
packages+=(${MINGW_PACKAGE_PREFIX}-lz4)
43-
packages+=(${MINGW_PACKAGE_PREFIX}-ninja)
44-
packages+=(${MINGW_PACKAGE_PREFIX}-nlohmann-json)
45-
packages+=(${MINGW_PACKAGE_PREFIX}-protobuf)
46-
packages+=(${MINGW_PACKAGE_PREFIX}-rapidjson)
47-
packages+=(${MINGW_PACKAGE_PREFIX}-re2)
48-
packages+=(${MINGW_PACKAGE_PREFIX}-snappy)
49-
packages+=(${MINGW_PACKAGE_PREFIX}-sqlite3)
50-
packages+=(${MINGW_PACKAGE_PREFIX}-thrift)
51-
packages+=(${MINGW_PACKAGE_PREFIX}-xsimd)
52-
packages+=(${MINGW_PACKAGE_PREFIX}-uriparser)
53-
packages+=(${MINGW_PACKAGE_PREFIX}-zstd)
27+
packages+=("${MINGW_PACKAGE_PREFIX}-aws-sdk-cpp")
28+
packages+=("${MINGW_PACKAGE_PREFIX}-boost")
29+
packages+=("${MINGW_PACKAGE_PREFIX}-brotli")
30+
packages+=("${MINGW_PACKAGE_PREFIX}-bzip2")
31+
packages+=("${MINGW_PACKAGE_PREFIX}-c-ares")
32+
packages+=("${MINGW_PACKAGE_PREFIX}-ccache")
33+
packages+=("${MINGW_PACKAGE_PREFIX}-clang")
34+
packages+=("${MINGW_PACKAGE_PREFIX}-cmake")
35+
packages+=("${MINGW_PACKAGE_PREFIX}-double-conversion")
36+
packages+=("${MINGW_PACKAGE_PREFIX}-gflags")
37+
packages+=("${MINGW_PACKAGE_PREFIX}-grpc")
38+
packages+=("${MINGW_PACKAGE_PREFIX}-gtest")
39+
packages+=("${MINGW_PACKAGE_PREFIX}-libutf8proc")
40+
packages+=("${MINGW_PACKAGE_PREFIX}-libxml2")
41+
packages+=("${MINGW_PACKAGE_PREFIX}-llvm")
42+
packages+=("${MINGW_PACKAGE_PREFIX}-lz4")
43+
packages+=("${MINGW_PACKAGE_PREFIX}-ninja")
44+
packages+=("${MINGW_PACKAGE_PREFIX}-nlohmann-json")
45+
packages+=("${MINGW_PACKAGE_PREFIX}-protobuf")
46+
packages+=("${MINGW_PACKAGE_PREFIX}-rapidjson")
47+
packages+=("${MINGW_PACKAGE_PREFIX}-re2")
48+
packages+=("${MINGW_PACKAGE_PREFIX}-snappy")
49+
packages+=("${MINGW_PACKAGE_PREFIX}-sqlite3")
50+
packages+=("${MINGW_PACKAGE_PREFIX}-thrift")
51+
packages+=("${MINGW_PACKAGE_PREFIX}-xsimd")
52+
packages+=("${MINGW_PACKAGE_PREFIX}-uriparser")
53+
packages+=("${MINGW_PACKAGE_PREFIX}-zstd")
5454

5555
if [ "${target}" != "ruby" ]; then
5656
# We don't update the exiting packages for Ruby because
5757
# RubyInstaller for Windows bundles some DLLs such as libffi,
5858
# OpenSSL and zlib separately. They should be ABI compatible
5959
# with packages installed by MSYS2. If we specify packages
6060
# explicitly here, the existing packages may be updated.
61-
packages+=(${MINGW_PACKAGE_PREFIX}-openssl)
62-
packages+=(${MINGW_PACKAGE_PREFIX}-zlib)
61+
packages+=("${MINGW_PACKAGE_PREFIX}-openssl")
62+
packages+=("${MINGW_PACKAGE_PREFIX}-zlib")
6363
fi
6464
;;
6565
esac
6666

6767
case "${target}" in
6868
c_glib|ruby)
69-
packages+=(${MINGW_PACKAGE_PREFIX}-gobject-introspection)
70-
packages+=(${MINGW_PACKAGE_PREFIX}-meson)
71-
packages+=(${MINGW_PACKAGE_PREFIX}-vala)
69+
packages+=("${MINGW_PACKAGE_PREFIX}-gobject-introspection")
70+
packages+=("${MINGW_PACKAGE_PREFIX}-meson")
71+
packages+=("${MINGW_PACKAGE_PREFIX}-vala")
7272
;;
7373
esac
7474

@@ -78,6 +78,7 @@ pacman \
7878
--sync \
7979
"${packages[@]}"
8080

81-
"$(dirname $0)/ccache_setup.sh"
82-
echo "CCACHE_DIR=$(cygpath --absolute --windows ccache)" >> $GITHUB_ENV
83-
echo "PIP_CACHE_DIR=$(pip cache dir)" >> $GITHUB_ENV
81+
ccache_dir=$(dirname "$0")
82+
"${ccache_dir}/ccache_setup.sh"
83+
echo "CCACHE_DIR=$(cygpath --absolute --windows ccache)" >> "$GITHUB_ENV"
84+
echo "PIP_CACHE_DIR=$(pip cache dir)" >> "$GITHUB_ENV"

0 commit comments

Comments
 (0)