feat: add Obico for Klipper to KIAUH #227
@@ -35,8 +35,11 @@ function moonraker_obico_needs_linking() {
|
||||
|
|
||||
if [[ ! -f "${moonraker_obico_cfg}" ]]; then
|
||||
return 1
|
||||
fi
|
||||
grep -s -E "^[^#]" "${moonraker_obico_cfg}" | grep -vq 'auth_token'
|
||||
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 :)
|
||||
return $?
|
||||
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 grep -s -E "^[^#]" "${moonraker_obico_cfg}" | grep -q 'auth_token'; 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 :)
|
||||
return 1
|
||||
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 :)
|
||||
else
|
||||
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 :)
|
||||
return 0
|
||||
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 :)
|
||||
fi
|
||||
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 :)
|
||||
}
|
||||
|
||||
function obico_server_url_prompt() {
|
||||
@@ -91,8 +94,8 @@ 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 :)
|
||||
blank_line
|
||||
if (( existing_moonraker_obico_count > 0 )); then
|
||||
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
```
|
||||
printf "|${green}%-55s${white}|\n" " ${existing_moonraker_obico_count} Moonraker-obico instances already installed!"
|
||||
for svc in "${moonraker_obico_services}"; do
|
||||
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 :)
|
||||
printf "|${cyan}%-57s${white}|\n" " ● moonraker-obco-$(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 :)
|
||||
for svc in ${moonraker_obico_services}; do
|
||||
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 :)
|
||||
printf "|${cyan}%-57s${white}|\n" " ● moonraker-obco-$(get_instance_name "${svc}" 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
|
||||
fi
|
||||
blank_line
|
||||
@@ -202,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 :)
|
||||
else
|
||||
printf "|${green}%-55s${white}|\n" " ${#not_linked_instances[@]} Moonraker-obico instances not linked to the server!"
|
||||
for i in "${not_linked_instances[@]}"; do
|
||||
printf "|${cyan}%-57s${white}|\n" " ● moonraker-obico-{moonraker_names[i]}"
|
||||
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 :)
|
||||
printf "|${cyan}%-57s${white}|\n" " ● moonraker-obico-${moonraker_names[${i}]}"
|
||||
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
|
||||
fi
|
||||
blank_line
|
||||
@@ -251,7 +254,7 @@ function clone_moonraker_obico() {
|
||||
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 :)
|
||||
|
||||
status_msg "Cloning Moonraker-obico from ${repo} ..."
|
||||
### force remove existing Moonraker-obico dir
|
||||
[[ -d ${repo} ]] && rm -rf "${MOONRAKER_OBICO_DIR}"
|
||||
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 :)
|
||||
[[ -d "${MOONRAKER_OBICO_DIR}" ]] && rm -rf "${MOONRAKER_OBICO_DIR}"
|
||||
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 :)
|
||||
|
||||
cd "${HOME}" || exit 1
|
||||
if ! git clone "${repo}" "${MOONRAKER_OBICO_DIR}"; then
|
||||
|
||||
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 :)
|
||||
@@ -771,7 +771,7 @@ function get_config_folders() {
|
||||
instance_names=$(get_multi_instance_names)
|
||||
|
||||
if [[ -n ${instance_names} ]]; then
|
||||
for name in "${instance_names}"; do
|
||||
for name in ${instance_names}; do
|
||||
###
|
||||
# by KIAUH convention, all instance names of only numbers
|
||||
# need to be prefixed with 'printer_'
|
||||
|
||||
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 :)