From 22262173b34656569dec42efcf6db8050d1e3af9 Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Mon, 15 Aug 2022 12:54:05 +0200
Subject: [PATCH] refactor: revert some previously made changes to KIAUH
 utility function

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
---
 scripts/moonraker-telegram-bot.sh | 2 +-
 scripts/moonraker.sh              | 2 +-
 scripts/octoprint.sh              | 2 +-
 scripts/utilities.sh              | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/moonraker-telegram-bot.sh b/scripts/moonraker-telegram-bot.sh
index 9e79ad9..d10c5e1 100644
--- a/scripts/moonraker-telegram-bot.sh
+++ b/scripts/moonraker-telegram-bot.sh
@@ -38,7 +38,7 @@ function telegram_bot_setup_dialog() {
   local moonraker_count user_input=() moonraker_names=()
   moonraker_count=$(echo "${moonraker_services}" | wc -w )
   for service in ${moonraker_services}; do
-    moonraker_names+=( "$(get_instance_name "${service}" moonraker)" )
+    moonraker_names+=( "$(get_instance_name "${service}")" )
   done
 
   local telegram_bot_count
diff --git a/scripts/moonraker.sh b/scripts/moonraker.sh
index 0e8cfe1..a773dc5 100644
--- a/scripts/moonraker.sh
+++ b/scripts/moonraker.sh
@@ -70,7 +70,7 @@ function moonraker_setup_dialog() {
   local klipper_count user_input=() klipper_names=()
   klipper_count=$(echo "${klipper_services}" | wc -w )
   for service in ${klipper_services}; do
-    klipper_names+=( "$(get_instance_name "${service}" klipper)" )
+    klipper_names+=( "$(get_instance_name "${service}")" )
   done
 
   local moonraker_count
diff --git a/scripts/octoprint.sh b/scripts/octoprint.sh
index dc3ad01..db118fe 100644
--- a/scripts/octoprint.sh
+++ b/scripts/octoprint.sh
@@ -35,7 +35,7 @@ function octoprint_setup_dialog() {
   local klipper_count user_input=() klipper_names=()
   klipper_count=$(echo "${klipper_services}" | wc -w )
   for service in ${klipper_services}; do
-    klipper_names+=( "$(get_instance_name "${service}" klipper)" )
+    klipper_names+=( "$(get_instance_name "${service}")" )
   done
 
   local octoprint_count
diff --git a/scripts/utilities.sh b/scripts/utilities.sh
index fe52dd1..2efc20e 100644
--- a/scripts/utilities.sh
+++ b/scripts/utilities.sh
@@ -675,8 +675,8 @@ function set_hostname() {
 ### input: /etc/systemd/system/klipper-name.service
 ### returns: name
 function get_instance_name() {
-  local instance=${1} base_name=${2} name
-  name=$(echo "${instance}" | rev | cut -d"/" -f1 | cut -d"." -f2 | rev | sed -E "s/${base_name}-//")
+  local instance=${1} name
+  name=$(echo "${instance}" | rev | cut -d"/" -f1 | rev | cut -d"-" -f2 | cut -d"." -f1)
   echo "${name}"
 }