refactor: revert some previously made changes to KIAUH utility function

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
th33xitus
2022-08-15 12:54:05 +02:00
parent ee86332988
commit 22262173b3
4 changed files with 5 additions and 5 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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}"
}