Skip to content

Commit 85d9b5a

Browse files
committed
Address more feedback
1 parent fc075e0 commit 85d9b5a

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

cpp/src/arrow/flight/sql/odbc/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,9 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
230230
# Upgrade GUID is required to be unchanged for ODBC installer to upgrade
231231
set(CPACK_WIX_UPGRADE_GUID "DBF27A18-F8BF-423F-9E3A-957414D52C4B")
232232
set(CPACK_WIX_PRODUCT_GUID "279D087B-93B5-4DC3-BA69-BCF485022A26")
233-
else()
233+
elseif(APPLE)
234234
# macOS and Linux
235-
if(APPLE)
236-
set(CPACK_GENERATOR "productbuild")
237-
endif()
235+
set(CPACK_GENERATOR "productbuild")
238236
endif()
239237
# GH-47877 TODO: create Linux Installer using cpack
240238

cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
# Used by arrow/cpp/src/arrow/flight/sql/odbc/install/mac/postinstall
20+
# Used by cpp/src/arrow/flight/sql/odbc/install/mac/postinstall
2121

2222
set -euo pipefail
2323

cpp/src/arrow/flight/sql/odbc/install/unix/install_odbc_ini.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ if grep -q '^\[ODBC Data Sources\]' "$SYSTEM_ODBC_FILE"; then
7070
' "$SYSTEM_ODBC_FILE" > "$tmp_file"
7171

7272
mv "$tmp_file" "$SYSTEM_ODBC_FILE"
73+
74+
# Restore expected permissions/ownership for system ODBC config
75+
chmod 644 "$SYSTEM_ODBC_FILE"
7376
fi
7477
else
7578
# Section doesn't exist, append section and DSN entry at end

0 commit comments

Comments
 (0)