h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

get_instance_name takes base_name now so that it won't confuse moonraker-obico as an instance of Moonraker

Browse Source
This commit is contained in:
Kenneth Jiang
2022-08-01 16:11:01 -07:00
parent 8f5bdf2707
commit ff9b563131
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/moonraker-telegram-bot.sh
View File

@@ -38,7 +38,7 @@ function telegram_bot_setup_dialog() {
local moonraker_count user_input=() moonraker_names=() local moonraker_count user_input=() moonraker_names=()
moonraker_count=$(echo "${moonraker_services}" | wc -w ) moonraker_count=$(echo "${moonraker_services}" | wc -w )
for service in ${moonraker_services}; do for service in ${moonraker_services}; do
moonraker_names+=( "$(get_instance_name "${service}")" ) moonraker_names+=( "$(get_instance_name "${service}" moonraker)" )
done done
local telegram_bot_count local telegram_bot_count

6
scripts/moonraker.sh
View File

@@ -17,7 +17,7 @@ set -e
function moonraker_systemd() { function moonraker_systemd() {
local services local services
services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[0-9a-zA-Z]+)?.service" | sort) services=$(find "${SYSTEMD}" -maxdepth 1 -regextype posix-extended -regex "${SYSTEMD}/moonraker(-[0-9a-zA-Z]+)?.service" | grep -v "moonraker-obico" | sort)
echo "${services}" echo "${services}"
} }
@@ -55,7 +55,7 @@ function moonraker_setup_dialog() {
local klipper_count user_input=() klipper_names=() local klipper_count user_input=() klipper_names=()
klipper_count=$(echo "${klipper_services}" | wc -w ) klipper_count=$(echo "${klipper_services}" | wc -w )
for service in ${klipper_services}; do for service in ${klipper_services}; do
klipper_names+=( "$(get_instance_name "${service}")" ) klipper_names+=( "$(get_instance_name "${service}" moonraker)" )
done done
local moonraker_count local moonraker_count
@@ -572,4 +572,4 @@ function compare_moonraker_versions() {
fi fi
echo "${versions}" echo "${versions}"
} }

8
scripts/obico.sh
View File

@@ -51,7 +51,7 @@ function get_moonraker_names() {
fi fi
for service in ${moonraker_services}; do for service in ${moonraker_services}; do
get_instance_name "${service}" get_instance_name "${service}" moonraker
done done
} }
@@ -89,7 +89,7 @@ function moonraker_obico_setup_dialog() {
moonraker_obico_services=$(moonraker_obico_systemd) moonraker_obico_services=$(moonraker_obico_systemd)
existing_moonraker_obico_count=$(echo "${moonraker_obico_services}" | wc -w ) existing_moonraker_obico_count=$(echo "${moonraker_obico_services}" | wc -w )
for service in ${moonraker_obico_services}; do for service in ${moonraker_obico_services}; do
moonraker_obico_names+=( "$(get_instance_name "${service}")" ) moonraker_obico_names+=( "$(get_instance_name "${service}" moonraker_obico)" )
done done
local allowed_moonraker_obico_count=$(( moonraker_count - existing_moonraker_obico_count )) local allowed_moonraker_obico_count=$(( moonraker_count - existing_moonraker_obico_count ))
@@ -205,7 +205,7 @@ function moonraker_obico_setup_dialog() {
### Step 7: Link to the Obico server if necessary ### Step 7: Link to the Obico server if necessary
local not_linked_instances=() local not_linked_instances=()
for service in $(moonraker_obico_systemd); do for service in $(moonraker_obico_systemd); do
local instance_name="$(get_instance_name ${service})" local instance_name="$(get_instance_name "${service}" moonraker_obico)"
if ! is_moonraker_obico_linked "${instance_name}"; then if ! is_moonraker_obico_linked "${instance_name}"; then
not_linked_instances+=( "${instance_name}" ) not_linked_instances+=( "${instance_name}" )
fi fi
@@ -367,7 +367,7 @@ function get_moonraker_obico_status() {
else else
status="Installed!" status="Installed!"
for service in ${moonraker_obico_services}; do for service in ${moonraker_obico_services}; do
if ! is_moonraker_obico_linked "$(get_instance_name ${service})"; then if ! is_moonraker_obico_linked "$(get_instance_name "${service}" moonraker_obico)"; then
status="Not linked!" status="Not linked!"
fi fi
done done

2
scripts/octoprint.sh
View File

@@ -35,7 +35,7 @@ function octoprint_setup_dialog() {
local klipper_count user_input=() klipper_names=() local klipper_count user_input=() klipper_names=()
klipper_count=$(echo "${klipper_services}" | wc -w ) klipper_count=$(echo "${klipper_services}" | wc -w )
for service in ${klipper_services}; do for service in ${klipper_services}; do
klipper_names+=( "$(get_instance_name "${service}")" ) klipper_names+=( "$(get_instance_name "${service}" klipper)" )
done done
local octoprint_count local octoprint_count

4
scripts/utilities.sh
View File

@@ -679,8 +679,8 @@ function set_hostname() {
### input: /etc/systemd/system/klipper-name.service ### input: /etc/systemd/system/klipper-name.service
### returns: name ### returns: name
function get_instance_name() { function get_instance_name() {
local instance=${1} name local instance=${1} base_name=${2} name
name=$(echo "${instance}" | rev | cut -d"/" -f1 | cut -d"-" -f1 | rev | cut -d"." -f1) name=$(echo "${instance}" | rev | cut -d"/" -f1 | cut -d"." -f2 | rev | sed -E "s/${base_name}-//")
echo "${name}" echo "${name}"
} }