feat: add Obico for Klipper to KIAUH #227
@@ -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_names+=( "$(get_instance_name "${service}" moonraker)" )
|
||||
done
|
||||
|
||||
local telegram_bot_count
|
||||
|
||||
@@ -17,7 +17,7 @@ set -e
|
||||
|
||||
function moonraker_systemd() {
|
||||
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}"
|
||||
}
|
||||
|
||||
@@ -55,7 +55,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_names+=( "$(get_instance_name "${service}" moonraker)" )
|
||||
done
|
||||
|
||||
local moonraker_count
|
||||
@@ -572,4 +572,4 @@ function compare_moonraker_versions() {
|
||||
fi
|
||||
|
||||
echo "${versions}"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ function get_moonraker_names() {
|
||||
|
|
||||
fi
|
||||
|
||||
for service in ${moonraker_services}; do
|
||||
get_instance_name "${service}"
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
get_instance_name "${service}" moonraker
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
done
|
||||
}
|
||||
|
||||
@@ -89,7 +89,7 @@ function moonraker_obico_setup_dialog() {
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
moonraker_obico_services=$(moonraker_obico_systemd)
|
||||
existing_moonraker_obico_count=$(echo "${moonraker_obico_services}" | wc -w )
|
||||
for service in ${moonraker_obico_services}; do
|
||||
moonraker_obico_names+=( "$(get_instance_name "${service}")" )
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
moonraker_obico_names+=( "$(get_instance_name "${service}" moonraker_obico)" )
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
done
|
||||
|
||||
local allowed_moonraker_obico_count=$(( moonraker_count - existing_moonraker_obico_count ))
|
||||
I'm unsure about the usage of this variable. It seems to be not used anywhere? Is it used somewhere else as it is not declared as a local variable? ```ssh
new_moonraker_obico_count=1
```
I'm unsure about the usage of this variable. It seems to be not used anywhere? Is it used somewhere else as it is not declared as a local variable?
Good catch. It's a bug! Do you want me to push this change? Good catch. It's a bug! Do you want me to push this change?
```
diff --git a/scripts/obico.sh b/scripts/obico.sh
index 791fcdb..de2bd3f 100644
--- a/scripts/obico.sh
+++ b/scripts/obico.sh
@@ -98,7 +98,6 @@ function moonraker_obico_setup_dialog() {
### Step 1: Ask for the number of moonraker-obico instances to install
if (( moonraker_count == 1 )); then
ok_msg "Moonraker installation found!\n"
- new_moonraker_obico_count=1
elif (( moonraker_count > 1 )); then
top_border
printf "|${green}%-55s${white}|\n" " ${moonraker_count} Moonraker instances found!"
@@ -134,7 +133,7 @@ function moonraker_obico_setup_dialog() {
(( new_moonraker_obico_count > allowed_moonraker_obico_count )) && error_msg "Number of Moonraker-obico instances larger than installed Moonraker instances"
done && select_msg "${new_moonraker_obico_count}"
else
- log_error "Internal error. new_moonraker_obico_count of '${new_moonraker_obico_count}' not equal or grather than one!"
+ log_error "Internal error. moonraker_count of '${moonraker_count}' not equal or grather than one!"
return 1
fi
```
|
||||
@@ -205,7 +205,7 @@ function moonraker_obico_setup_dialog() {
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
### Step 7: Link to the Obico server if necessary
|
||||
local not_linked_instances=()
|
||||
for service in $(moonraker_obico_systemd); do
|
||||
local instance_name="$(get_instance_name ${service})"
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
local instance_name="$(get_instance_name "${service}" moonraker_obico)"
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
if ! is_moonraker_obico_linked "${instance_name}"; then
|
||||
not_linked_instances+=( "${instance_name}" )
|
||||
fi
|
||||
@@ -367,7 +367,7 @@ function get_moonraker_obico_status() {
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
else
|
||||
status="Installed!"
|
||||
for service in ${moonraker_obico_services}; do
|
||||
if ! is_moonraker_obico_linked "$(get_instance_name ${service})"; then
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
if ! is_moonraker_obico_linked "$(get_instance_name "${service}" moonraker_obico)"; then
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
status="Not linked!"
|
||||
fi
|
||||
done
|
||||
|
||||
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
This variable seems to be unused? ```ssh
local log="${KLIPPER_LOGS}"
```
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Another good catch. I guess I planed to use it but ended up using Another good catch. I guess I planed to use it but ended up using `"${KLIPPER_LOGS}"` directly. Feel free to remove it.
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
Can this variable be local? Or is it required to be global? I see it only being used inside the Can this variable be local? Or is it required to be global? I see it only being used inside the `moonraker_obico_needs_linking` function
This variable seems to be unused now? This variable seems to be unused now?
This variable seems to be unused now? This variable seems to be unused now?
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
See comment above :) See comment above :)
|
||||
@@ -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_names+=( "$(get_instance_name "${service}" klipper)" )
|
||||
done
|
||||
|
||||
local octoprint_count
|
||||
|
||||
@@ -679,8 +679,8 @@ function set_hostname() {
|
||||
### input: /etc/systemd/system/klipper-name.service
|
||||
### returns: name
|
||||
function get_instance_name() {
|
||||
local instance=${1} name
|
||||
name=$(echo "${instance}" | rev | cut -d"/" -f1 | cut -d"-" -f1 | rev | cut -d"." -f1)
|
||||
local instance=${1} base_name=${2} name
|
||||
name=$(echo "${instance}" | rev | cut -d"/" -f1 | cut -d"." -f2 | rev | sed -E "s/${base_name}-//")
|
||||
echo "${name}"
|
||||
}
|
||||
|
||||
|
||||
This variable seems to be unused?
This variable seems to be unused?
Another good catch. I guess I planed to use it but ended up using
"${KLIPPER_LOGS}"directly. Feel free to remove it.Another good catch. I guess I planed to use it but ended up using
"${KLIPPER_LOGS}"directly. Feel free to remove it.Can this variable be local? Or is it required to be global? I see it only being used inside the
moonraker_obico_needs_linkingfunctionCan this variable be local? Or is it required to be global? I see it only being used inside the
moonraker_obico_needs_linkingfunctionThis variable seems to be unused now?
This variable seems to be unused now?
See comment above :)
See comment above :)
See comment above :)
See comment above :)