use /usr/local/share on macOS

Signed-off-by: Justin Kolberg <[email protected]>
SumoLogic · Oct 23, 2024 · 08cb85e · 08cb85e
1 parent 436425c
commit 08cb85e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/assets/productbuild/uninstall.sh b/assets/productbuild/uninstall.sh
@@ -49,8 +49,8 @@ collector_files=(
   "/etc/otelcol-sumo/opamp.d"
   "/usr/local/bin/otelcol-config"
   "/usr/local/bin/otelcol-sumo"
-  "/usr/share/otelcol-sumo/otelcol-sumo.sh"
-  "/usr/share/otelcol-sumo"
+  "/usr/local/share/otelcol-sumo"
+  "/usr/local/share/otelcol-sumo/otelcol-sumo.sh"
   "/var/lib/otelcol-sumo/file_storage"
   "/var/lib/otelcol-sumo"
   "/var/log/otelcol-sumo"

diff --git a/assets/services/launchd/com.sumologic.otelcol-sumo.plist b/assets/services/launchd/com.sumologic.otelcol-sumo.plist
@@ -6,7 +6,7 @@
     <string>otelcol-sumo</string>
     <key>ProgramArguments</key>
     <array>
-      <string>/usr/share/otelcol-sumo.sh</string>
+      <string>/usr/local/share/otelcol-sumo.sh</string>
     </array>
     <key>EnvironmentVariables</key>
     <dict>

diff --git a/ci/verify_installer.sh b/ci/verify_installer.sh
@@ -37,7 +37,7 @@ system_files=(
   "usr"
   "usr/local"
   "usr/local/bin"
-  "usr/share"
+  "usr/local/share"
   "var"
   "var/lib"
   "var/log"
@@ -60,8 +60,8 @@ expected_collector_files=(
   "Library/LaunchDaemons/com.sumologic.otelcol-sumo.plist"
   "usr/local/bin/otelcol-config"
   "usr/local/bin/otelcol-sumo"
-  "usr/share/otelcol-sumo"
-  "usr/share/otelcol-sumo/otelcol-sumo.sh"
+  "usr/local/share/otelcol-sumo"
+  "usr/local/share/otelcol-sumo/otelcol-sumo.sh"
   "var/lib/otelcol-sumo"
   "var/lib/otelcol-sumo/file_storage"
   "var/log/otelcol-sumo"

diff --git a/settings/otc.cmake b/settings/otc.cmake
@@ -41,6 +41,9 @@ macro(set_otc_settings)
   set(OTC_SYSTEMD_DIR "lib/systemd/system")
   set(OTC_LOG_DIR "var/log/otelcol-sumo")
   set(OTC_SHARE_DIR "usr/share/otelcol-sumo")
+  if("${goos}" STREQUAL "darwin")
+    set(OTC_SHARE_DIR "usr/local/share/otelcol-sumo")
+  endif()
 
   # File paths
   set(OTC_BIN_PATH "${OTC_BIN_DIR}/${OTC_BINARY}")