Address feedback

Author: justing-bq

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

@@ -212,15 +212,14 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
 
     # Install documentation files
     install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../LICENSE.txt"
-            DESTINATION "${ODBC_DOC_INSTALL_DIR}"
-            COMPONENT Docs)
-    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/connection-options.md"
+                  "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../NOTICE.txt"
+                  "${CMAKE_CURRENT_SOURCE_DIR}/connection-options.md"
             DESTINATION "${ODBC_DOC_INSTALL_DIR}"
             COMPONENT Docs)
   endif()
 
   get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
-  set(CPACK_COMPONENTS_ALL "ArrowFlightSQLODBC")
+  set(CPACK_COMPONENTS_ALL "ArrowFlightSQLODBC" "Docs")
 
   if(WIN32)
     # WiX msi installer on Windows
@@ -233,7 +232,6 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
     set(CPACK_WIX_PRODUCT_GUID "279D087B-93B5-4DC3-BA69-BCF485022A26")
   else()
     # macOS and Linux
-    list(APPEND CPACK_COMPONENTS_ALL Docs)
     if(APPLE)
       set(CPACK_GENERATOR "productbuild")
     endif()
@@ -246,11 +244,8 @@ if(ARROW_FLIGHT_SQL_ODBC_INSTALLER)
                       DISPLAY_NAME "ODBC library"
                       DESCRIPTION "Apache Arrow Flight SQL ODBC library bin, required to install"
                       REQUIRED)
-  if(UNIX)
-    # On macOS and Linux, provide connection string documentation since users need to manually enter DSN keys.
-    cpack_add_component(Docs
-                        DISPLAY_NAME "Documentation"
-                        DESCRIPTION "Documentation for Apache Arrow Flight SQL ODBC Driver"
-    )
-  endif()
+  cpack_add_component(Docs
+                      DISPLAY_NAME "Documentation"
+                      DESCRIPTION "Documentation for Apache Arrow Flight SQL ODBC Driver"
+                      REQUIRED)
 endif()

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

@@ -42,44 +42,51 @@ fi
 
 case "$(uname)" in
   Linux)
-    ODBCINST_FILE="/etc/odbcinst.ini"
+    SYSTEM_ODBCINST_FILE="/etc/odbcinst.ini"
     ;;
   *)
     # macOS
-    ODBCINST_FILE="/Library/ODBC/odbcinst.ini"
+    SYSTEM_ODBCINST_FILE="/Library/ODBC/odbcinst.ini"
     mkdir -p /Library/ODBC
     ;;
 esac
 
 DRIVER_NAME="Apache Arrow Flight SQL ODBC Driver"
 
-touch "$ODBCINST_FILE"
+touch "$SYSTEM_ODBCINST_FILE"
 
-if grep -q "^\[$DRIVER_NAME\]" "$ODBCINST_FILE"; then
+if grep -q "^\[$DRIVER_NAME\]" "$SYSTEM_ODBCINST_FILE"; then
   echo "Driver [$DRIVER_NAME] already exists in odbcinst.ini"
 else
   echo "Adding [$DRIVER_NAME] to odbcinst.ini..."
   echo "
 [$DRIVER_NAME]
 Description=An ODBC Driver for Apache Arrow Flight SQL
 Driver=$ODBC_64BIT
-" >>"$ODBCINST_FILE"
+" >>"$SYSTEM_ODBCINST_FILE"
 fi
 
 # Check if [ODBC Drivers] section exists
-if grep -q '^\[ODBC Drivers\]' "$ODBCINST_FILE"; then
+if grep -q '^\[ODBC Drivers\]' "$SYSTEM_ODBCINST_FILE"; then
   # Section exists: check if driver entry exists
-  if ! grep -q "^${DRIVER_NAME}=" "$ODBCINST_FILE"; then
+  if ! grep -q "^${DRIVER_NAME}=" "$SYSTEM_ODBCINST_FILE"; then
     # Driver entry does not exist, add under [ODBC Drivers]
-    sed -i '' "/^\[ODBC Drivers\]/a\\
-${DRIVER_NAME}=Installed
-" "$ODBCINST_FILE"
+
+    awk -v driver="$DRIVER_NAME" '
+      $0 ~ /^\[ODBC Drivers\]/ && !inserted {
+        print
+        print driver "=Installed"
+        inserted=1
+        next
+      }
+      { print }
+    ' "$SYSTEM_ODBCINST_FILE" > "${SYSTEM_ODBCINST_FILE}.tmp" && mv "${SYSTEM_ODBCINST_FILE}.tmp" "$SYSTEM_ODBCINST_FILE"
   fi
 else
   # Section doesn't exist, append both section and driver entry at end
   {
     echo ""
     echo "[ODBC Drivers]"
     echo "${DRIVER_NAME}=Installed"
-  } >>"$ODBCINST_FILE"
+  } >>"$SYSTEM_ODBCINST_FILE"
 fi