From ee07f43f6e8c4272eb687e14da06c050cf5eec40 Mon Sep 17 00:00:00 2001 From: freakynl Date: Mon, 5 Oct 2026 10:12:56 +0200 Subject: [PATCH 1/4] 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 From 1e5edc66a7d9c86a8fb0ccf6ea0063599ed396e3 Mon Sep 17 00:00:00 2001 From: freakynl Date: Mon, 5 Oct 2026 10:19:10 +0200 Subject: [PATCH 2/4] Update install.sh Improved variable consistency --- shared/services/rocketpool/assets/scripts/install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/shared/services/rocketpool/assets/scripts/install.sh b/shared/services/rocketpool/assets/scripts/install.sh index 552e275dc..131ef2ad5 100755 --- a/shared/services/rocketpool/assets/scripts/install.sh +++ b/shared/services/rocketpool/assets/scripts/install.sh @@ -245,14 +245,13 @@ case "$PLATFORM" in # Unsupported OS *) - RED='\033[0;31m' echo "" - echo -e "${RED}**ERROR**" + echo -e "${COLOR_RED}**ERROR**" echo "Automatic dependency installation for the $PLATFORM operating system is not supported." echo "Please install docker and docker-compose-plugin manually, then try again with the '-d' flag to skip OS dependency installation." echo "Be sure to add yourself to the docker group with '$SUDO_CMD usermod -aG docker $USER' after installing docker." echo "Log out and back in, or restart your system after you run this command." - echo -e "${RESET}" + echo -e "${COLOR_RESET}" exit 1 ;; From 2b5acfbd1f528ac8223c670c733bad63da645775 Mon Sep 17 00:00:00 2001 From: Fornax <23104993+0xfornax@users.noreply.github.com> Date: Mon, 5 Oct 2026 13:43:12 -0300 Subject: [PATCH 3/4] Fix backtick bug that was recursing the install command instead of printing it --- shared/services/rocketpool/assets/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/services/rocketpool/assets/scripts/install.sh b/shared/services/rocketpool/assets/scripts/install.sh index 131ef2ad5..fc37ce847 100755 --- a/shared/services/rocketpool/assets/scripts/install.sh +++ b/shared/services/rocketpool/assets/scripts/install.sh @@ -333,7 +333,7 @@ else 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 "Please install docker-compose-plugin manually, then try running 'rocketpool service install -d' again to finish updating." echo -e "${COLOR_RESET}" exit 1 fi From 9ce3cd3bce42df09188c3652830674d0fdcff400 Mon Sep 17 00:00:00 2001 From: Fornax <23104993+0xfornax@users.noreply.github.com> Date: Mon, 5 Oct 2026 13:47:39 -0300 Subject: [PATCH 4/4] Remove unnecessary parentheses --- shared/services/rocketpool/assets/scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/services/rocketpool/assets/scripts/install.sh b/shared/services/rocketpool/assets/scripts/install.sh index fc37ce847..3a99f9dbe 100755 --- a/shared/services/rocketpool/assets/scripts/install.sh +++ b/shared/services/rocketpool/assets/scripts/install.sh @@ -326,7 +326,7 @@ else *) # Check for existing docker-compose-plugin installation progress 3 "Checking if docker-compose-plugin is installed..." - if (docker compose version 2>/dev/null 1>/dev/null) ; then + if docker compose version 2>/dev/null 1>/dev/null ; then echo "Already installed." else echo ""