From 09d7f21fed11fd664ee1f4d39be3e86192d6c1bd Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 10 Sep 2026 19:51:41 +0900 Subject: [PATCH 1/4] GH-51283: [C++] Fix shellcheck errors in cpp/thirdparty/download_dependencies.sh --- .pre-commit-config.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b47ce4ac02c..b3216a3daba 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -287,10 +287,8 @@ repos: ?^cpp/build-support/.*\.sh$| ?^cpp/examples/minimal_build/run\.sh$| ?^cpp/examples/tutorial_examples/run\.sh$| - ?^cpp/src/arrow/flight/sql/odbc/install/mac/postinstall$| - ?^cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc\.sh$| - ?^cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini\.sh$| - ?^cpp/src/arrow/flight/sql/odbc/tests/dremio/set_up_dremio_instance\.sh$| + ?^cpp/src/arrow/flight/.*\.sh$| + ?^cpp/thirdparty/download_dependencies\.sh$| ?^dev/release/05-binary-upload\.sh$| ?^dev/release/07-flightsqlodbc-upload\.sh$| ?^dev/release/08-publish-gh-release\.sh$| From 0c30d592283c06c9568d327ccd0f8e70575b91da Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 10 Sep 2026 19:52:00 +0900 Subject: [PATCH 2/4] test --- cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh b/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh index 4fa7a31901f..93d2fe7738b 100755 --- a/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh +++ b/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh @@ -31,7 +31,7 @@ DRIVER_NAME="Apache Arrow Flight SQL ODBC Driver" DSN_NAME="Apache Arrow Flight SQL ODBC DSN" if ! touch "$SYSTEM_ODBC_FILE"; then - echo "ERROR: Cannot access or create $SYSTEM_ODBC_FILE" >&2 + echo ERROR: Cannot access or create $SYSTEM_ODBC_FILE >&2 exit 1 fi From fb058cdb0f45c5c3fb96d466e713415c88f9019e Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 10 Sep 2026 20:06:49 +0900 Subject: [PATCH 3/4] Revert "test" This reverts commit 0c30d592283c06c9568d327ccd0f8e70575b91da. --- cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh b/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh index 93d2fe7738b..4fa7a31901f 100755 --- a/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh +++ b/cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh @@ -31,7 +31,7 @@ DRIVER_NAME="Apache Arrow Flight SQL ODBC Driver" DSN_NAME="Apache Arrow Flight SQL ODBC DSN" if ! touch "$SYSTEM_ODBC_FILE"; then - echo ERROR: Cannot access or create $SYSTEM_ODBC_FILE >&2 + echo "ERROR: Cannot access or create $SYSTEM_ODBC_FILE" >&2 exit 1 fi From 27fd838cf78335150a59181ab911f17548b574ca Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 10 Sep 2026 20:07:58 +0900 Subject: [PATCH 4/4] Quoate variable --- cpp/thirdparty/download_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/thirdparty/download_dependencies.sh b/cpp/thirdparty/download_dependencies.sh index de6c5b5b88b..e55666beaef 100755 --- a/cpp/thirdparty/download_dependencies.sh +++ b/cpp/thirdparty/download_dependencies.sh @@ -48,7 +48,7 @@ main() { mkdir -p "${DESTDIR}" # Load `DEPENDENCIES` variable. - source ${SOURCE_DIR}/versions.txt + source "${SOURCE_DIR}/versions.txt" echo "# Environment variables for offline Arrow build" for ((i = 0; i < ${#DEPENDENCIES[@]}; i++)); do