From 8d3ddc273adce8b7fe7e2facd36474b7ad54eafd Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Fri, 22 Oct 2021 23:52:58 +0200
Subject: [PATCH] fix: allow non-single digit instance counts containing a 0
 #129

---
 scripts/install_klipper.sh   | 4 ++--
 scripts/install_moonraker.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install_klipper.sh b/scripts/install_klipper.sh
index ce9b907..6ee6dfe 100755
--- a/scripts/install_klipper.sh
+++ b/scripts/install_klipper.sh
@@ -20,10 +20,10 @@ klipper_setup_dialog(){
 
   ### ask for amount of instances to create
   INSTANCE_COUNT=""
-  while [[ ! ($INSTANCE_COUNT =~ ^[1-9]+$) ]]; do
+  while [[ ! ($INSTANCE_COUNT =~ ^[1-9]+((0)+)?$) ]]; do
     echo
     read -p "${cyan}###### Number of Klipper instances to set up:${default} " INSTANCE_COUNT
-    if [[ ! ($INSTANCE_COUNT =~ ^[1-9]+$) ]]; then
+    if [[ ! ($INSTANCE_COUNT =~ ^[1-9]+((0)+)?$) ]]; then
       warn_msg "Invalid Input!" && echo
     else
       echo
diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh
index 4ad94e0..b6d2d75 100755
--- a/scripts/install_moonraker.sh
+++ b/scripts/install_moonraker.sh
@@ -48,7 +48,7 @@ moonraker_setup_dialog(){
   if [ "$(systemctl list-units --full -all -t service --no-legend | grep -F "klipper.service")" ]; then
     INSTANCE_COUNT=1
   else
-    INSTANCE_COUNT=$(systemctl list-units --full -all -t service --no-legend | grep -E "klipper-[[:digit:]].service" | wc -l)
+    INSTANCE_COUNT=$(systemctl list-units --full -all -t service --no-legend | grep -E "klipper-[[:digit:]]+.service" | wc -l)
   fi
 
   ### initial moonraker.conf path check