From 432207808af683ad56fa158c408d7671361eb1e5 Mon Sep 17 00:00:00 2001 From: Andrejus Date: Sat, 31 May 2025 22:26:50 +0100 Subject: [PATCH] fix(agent): log non-darwin installs --- script/install.d/30-iterm2.sh | 2 ++ script/install.d/40-nerdfont.sh | 2 ++ script/install.d/50-redis.sh | 3 ++- script/install.d/70-cca.sh | 2 ++ script/install.d/71-rectangle.sh | 2 ++ script/install.d/72-meetingbar.sh | 2 ++ script/install.d/73-betterdisplay.sh | 2 ++ script/install.d/74-dockutil.sh | 2 ++ script/install.d/75-arc.sh | 2 ++ script/install.d/76-appcleaner.sh | 2 ++ script/install.d/97-macos.sh | 2 ++ 11 files changed, 22 insertions(+), 1 deletion(-) diff --git a/script/install.d/30-iterm2.sh b/script/install.d/30-iterm2.sh index 52d4c12..56cf2e1 100644 --- a/script/install.d/30-iterm2.sh +++ b/script/install.d/30-iterm2.sh @@ -9,4 +9,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then if ! brew list --cask iterm2 &>/dev/null; then brew install --cask iterm2 fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/40-nerdfont.sh b/script/install.d/40-nerdfont.sh index 68d8453..a1be4a4 100644 --- a/script/install.d/40-nerdfont.sh +++ b/script/install.d/40-nerdfont.sh @@ -19,4 +19,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then fi unset fonts_list +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/50-redis.sh b/script/install.d/50-redis.sh index b2e44e0..2337934 100644 --- a/script/install.d/50-redis.sh +++ b/script/install.d/50-redis.sh @@ -11,7 +11,8 @@ if ! command -v redis-client &>/dev/null; then if [[ ! -f "$redis_keyring_path" ]]; then curl -fsSL https://packages.redis.io/gpg | sudo gpg --dearmor -o "$redis_keyring_path" fi - echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/redis.list + echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb $(lsb_release -cs) main" \ + | sudo tee /etc/apt/sources.list.d/redis.list > /dev/null sudo apt-get install -qq redis elif [[ "$OSTYPE" == "darwin"* ]]; then brew install redis diff --git a/script/install.d/70-cca.sh b/script/install.d/70-cca.sh index 5609be1..60c7b69 100644 --- a/script/install.d/70-cca.sh +++ b/script/install.d/70-cca.sh @@ -11,4 +11,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "Colour Contrast Analyser (CCA) is already installed." fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/71-rectangle.sh b/script/install.d/71-rectangle.sh index ef9e9df..09f4d77 100644 --- a/script/install.d/71-rectangle.sh +++ b/script/install.d/71-rectangle.sh @@ -11,4 +11,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "Rectangle is already installed." fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/72-meetingbar.sh b/script/install.d/72-meetingbar.sh index 51c4a22..042382e 100644 --- a/script/install.d/72-meetingbar.sh +++ b/script/install.d/72-meetingbar.sh @@ -11,4 +11,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "MeetingBar is already installed." fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/73-betterdisplay.sh b/script/install.d/73-betterdisplay.sh index d5c5280..0044a9f 100644 --- a/script/install.d/73-betterdisplay.sh +++ b/script/install.d/73-betterdisplay.sh @@ -11,4 +11,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "BetterDisplay is already installed." fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/74-dockutil.sh b/script/install.d/74-dockutil.sh index ea05580..0992dda 100644 --- a/script/install.d/74-dockutil.sh +++ b/script/install.d/74-dockutil.sh @@ -11,4 +11,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "dockutil is already installed." fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/75-arc.sh b/script/install.d/75-arc.sh index 38ce5c0..c3edc40 100644 --- a/script/install.d/75-arc.sh +++ b/script/install.d/75-arc.sh @@ -11,4 +11,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "Arc Browser is already installed." fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/76-appcleaner.sh b/script/install.d/76-appcleaner.sh index f94e948..9c23a19 100644 --- a/script/install.d/76-appcleaner.sh +++ b/script/install.d/76-appcleaner.sh @@ -12,4 +12,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then else echo "AppCleaner is already installed." fi +else + echo "Skipping: Not macOS" fi diff --git a/script/install.d/97-macos.sh b/script/install.d/97-macos.sh index 5e425bd..8a39f99 100644 --- a/script/install.d/97-macos.sh +++ b/script/install.d/97-macos.sh @@ -184,4 +184,6 @@ if [[ "$OSTYPE" == "darwin"* ]]; then fi killall Dock 2>/dev/null || true +else + echo "Skipping: Not macOS" fi