From 08cb85e8330bd2251b07c052248f15f4518fb5ab Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Tue, 22 Oct 2024 21:01:39 -0700 Subject: [PATCH] use /usr/local/share on macOS Signed-off-by: Justin Kolberg --- assets/productbuild/uninstall.sh | 4 ++-- assets/services/launchd/com.sumologic.otelcol-sumo.plist | 2 +- ci/verify_installer.sh | 6 +++--- settings/otc.cmake | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/assets/productbuild/uninstall.sh b/assets/productbuild/uninstall.sh index 56c08672..636450b3 100755 --- 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 index 043984dc..1050d897 100644 --- a/assets/services/launchd/com.sumologic.otelcol-sumo.plist +++ b/assets/services/launchd/com.sumologic.otelcol-sumo.plist @@ -6,7 +6,7 @@ otelcol-sumo ProgramArguments - /usr/share/otelcol-sumo.sh + /usr/local/share/otelcol-sumo.sh EnvironmentVariables diff --git a/ci/verify_installer.sh b/ci/verify_installer.sh index dd07b7b1..2f3eda2d 100755 --- 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 index a4ae5aad..1d19c215 100644 --- 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}")