From 9a51e72ca161fd8fd7dbd32489452f9414c829d2 Mon Sep 17 00:00:00 2001
From: lrgex <info@lrgex.com>
Date: Tue, 14 Nov 2023 15:14:20 +0300
Subject: [PATCH] v2.0

---
 .github/workflows/docker-image.yml |  2 +-
 scripts/docker-entrypoint.sh       | 10 ++++++----
 test/test-entrypoint.sh            | 10 ++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index a0e107e..bcaefa4 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -46,4 +46,4 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
-          tags: lrgex/klipper-docker:latest
+          tags: lrgex/klipper-docker:2.0
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index d0c6b6d..5011c60 100644
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -41,17 +41,19 @@ for package in "${packages_array[@]}"; do
         echo "Installing Fluidd with Kiauh..."
         su lrgex -c 'expect ./fluidd.exp'
     elif [ -d "/home/lrgex/mainsail" ]; then
-        echo "Mainsail detected, skipping Fluidd installation."
-        echo "If you want to install Fluidd, please re run the container without the Mainsail package. .e.g [-e PACKAGES=klipper,moonraker,fluidd]]"
+        echo -e "\e[31mMainsail detected, skipping Fluidd installation.\e[0m"
+        echo -e "\e[31mIf you want to install Fluidd, please re run the container without the Mainsail package. .e.g [-e PACKAGES=klipper,moonraker,fluidd]]\e[0m"
         sleep 5
+        break
     fi
     if [ "${package}" = "mainsail" ] && [ ! -d "/home/lrgex/mainsail" ] && [ ! -d "/home/lrgex/fluidd" ]; then
         echo "Installing Mainsail with Kiauh..."
         su lrgex -c 'expect ./mainsail.exp'
     elif [ -d "/home/lrgex/fluidd" ]; then
-        echo "Fluidd detected, skipping Mainsail installation."
-        echo "If you want to install Mainsail, please re run the container without the Fluidd package. .e.g [-e PACKAGES=klipper,moonraker,mainsail]"
+        echo -e "\e[31mFluidd detected, skipping Mainsail installation.\e[0m"
+        echo -e "\e[31mIf you want to install Mainsail, please re run the container without the Fluidd package. .e.g [-e PACKAGES=klipper,moonraker,mainsail]\e[0m"
         sleep 5
+        break
     fi
 done
 
diff --git a/test/test-entrypoint.sh b/test/test-entrypoint.sh
index d0c6b6d..5011c60 100644
--- a/test/test-entrypoint.sh
+++ b/test/test-entrypoint.sh
@@ -41,17 +41,19 @@ for package in "${packages_array[@]}"; do
         echo "Installing Fluidd with Kiauh..."
         su lrgex -c 'expect ./fluidd.exp'
     elif [ -d "/home/lrgex/mainsail" ]; then
-        echo "Mainsail detected, skipping Fluidd installation."
-        echo "If you want to install Fluidd, please re run the container without the Mainsail package. .e.g [-e PACKAGES=klipper,moonraker,fluidd]]"
+        echo -e "\e[31mMainsail detected, skipping Fluidd installation.\e[0m"
+        echo -e "\e[31mIf you want to install Fluidd, please re run the container without the Mainsail package. .e.g [-e PACKAGES=klipper,moonraker,fluidd]]\e[0m"
         sleep 5
+        break
     fi
     if [ "${package}" = "mainsail" ] && [ ! -d "/home/lrgex/mainsail" ] && [ ! -d "/home/lrgex/fluidd" ]; then
         echo "Installing Mainsail with Kiauh..."
         su lrgex -c 'expect ./mainsail.exp'
     elif [ -d "/home/lrgex/fluidd" ]; then
-        echo "Fluidd detected, skipping Mainsail installation."
-        echo "If you want to install Mainsail, please re run the container without the Fluidd package. .e.g [-e PACKAGES=klipper,moonraker,mainsail]"
+        echo -e "\e[31mFluidd detected, skipping Mainsail installation.\e[0m"
+        echo -e "\e[31mIf you want to install Mainsail, please re run the container without the Fluidd package. .e.g [-e PACKAGES=klipper,moonraker,mainsail]\e[0m"
         sleep 5
+        break
     fi
 done