From ee07f43f6e8c4272eb687e14da06c050cf5eec40 Mon Sep 17 00:00:00 2001 From: freakynl Date: Mon, 5 Oct 2026 10:12:56 +0200 Subject: [PATCH] Update install.sh Variable consistency. Might want to look into moving the output to fail() completely - but it's multi line. --- shared/services/rocketpool/assets/scripts/install.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/shared/services/rocketpool/assets/scripts/install.sh b/shared/services/rocketpool/assets/scripts/install.sh index 6ad6d9dd5..552e275dc 100755 --- a/shared/services/rocketpool/assets/scripts/install.sh +++ b/shared/services/rocketpool/assets/scripts/install.sh @@ -13,7 +13,7 @@ COLOR_RESET='\033[0m' # Print a failure message to stderr and exit fail() { MESSAGE=$1 - >&2 echo -e "\n${COLOR_RED}**ERROR**\n$MESSAGE${COLOR_RESET}" + >&2 echo -e "\n${COLOR_RED}**ERROR**\n${MESSAGE}${COLOR_RESET}" exit 1 } @@ -327,16 +327,15 @@ else *) # Check for existing docker-compose-plugin installation progress 3 "Checking if docker-compose-plugin is installed..." - if docker compose 2>/dev/null 1>/dev/null ; then + if (docker compose version 2>/dev/null 1>/dev/null) ; then echo "Already installed." else - RED='\033[0;31m' echo "" - echo -e "${RED}**ERROR**" + echo -e "${COLOR_RED}**ERROR**" echo "The docker-compose-plugin package is not installed. Starting with v1.7.0, the Smart Node requires this package because the legacy docker-compose script is no longer supported." echo "Since automatic dependency installation for the $PLATFORM operating system is not supported, you will need to install it manually." echo "Please install docker-compose-plugin manually, then try running `rocketpool service install -d` again to finish updating." - echo -e "${RESET}" + echo -e "${COLOR_RESET}" exit 1 fi