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

Single-instance and multi-instance need to be treated differently

Browse Source
This commit is contained in:
Kenneth Jiang
2022-08-01 17:49:32 -07:00
parent a619df2364
commit db203d0321
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/obico.sh
View File

@@ -23,7 +23,7 @@ function moonraker_obico_systemd() {
function cfg_dir() { function cfg_dir() {
local name=${1} local name=${1}
if [[ -z ${name} ]]; then if [[ -z ${name} || ${name} == "moonraker" || ${name} == "moonraker-obico" ]]; then
echo "${KLIPPER_CONFIG}" echo "${KLIPPER_CONFIG}"
else else
local re="^[1-9][0-9]*$" local re="^[1-9][0-9]*$"
@@ -39,7 +39,7 @@ function cfg_dir() {
function is_moonraker_obico_linked() { function is_moonraker_obico_linked() {
local name=${1} local name=${1}
moonraker_obico_cfg="$(cfg_dir ${name})/moonraker-obico.cfg" moonraker_obico_cfg="$(cfg_dir ${name})/moonraker-obico.cfg"
grep -E "^[^#]" "${moonraker_obico_cfg}" | grep -q 'auth_token' grep -s -E "^[^#]" "${moonraker_obico_cfg}" | grep -q 'auth_token'
return $? return $?
} }
@@ -204,6 +204,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=()
# Refetch systemd service again since additional services may have been newly installed
for service in $(moonraker_obico_systemd); do for service in $(moonraker_obico_systemd); do
local instance_name="$(get_instance_name "${service}" moonraker_obico)" 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
@@ -212,10 +213,14 @@ function moonraker_obico_setup_dialog() {
done done
if (( ${#not_linked_instances[@]} > 0 )); then if (( ${#not_linked_instances[@]} > 0 )); then
top_border top_border
printf "|${green}%-55s${white}|\n" " ${#not_linked_instances[@]} Moonraker-obico instances not linked to the server!" if (( moonraker_count == 1 )); then
for name in "${not_linked_instances[@]}"; do printf "|${green}%-55s${white}|\n" " Moonraker-obico not linked to the server!"
printf "|${cyan}%-57s${white}|\n" " ●moonrakerobico-${name}" else
done printf "|${green}%-55s${white}|\n" " ${#not_linked_instances[@]} Moonraker-obico instances not linked to the server!"
for name in "${not_linked_instances[@]}"; do
printf "|${cyan}%-57s${white}|\n" " ●moonrakerobico-${name}"
done
fi
blank_line blank_line
echo -e "| To link to your Obico Server account, you need to |" echo -e "| To link to your Obico Server account, you need to |"
echo -e "| obtain the 6-digit verification code in the Obico |" echo -e "| obtain the 6-digit verification code in the Obico |"
@@ -248,7 +253,11 @@ function moonraker_obico_setup_dialog() {
for name in "${not_linked_instances[@]}"; do for name in "${not_linked_instances[@]}"; do
status_msg "Link moonraker-obico-${name} to the Obico Server..." status_msg "Link moonraker-obico-${name} to the Obico Server..."
moonraker_obico_cfg="$(cfg_dir ${name})/moonraker-obico.cfg" moonraker_obico_cfg="$(cfg_dir ${name})/moonraker-obico.cfg"
"${MOONRAKER_OBICO_DIR}/scripts/link.sh" -q -n "${name}" -c "${moonraker_obico_cfg}" if (( moonraker_count == 1 )); then
"${MOONRAKER_OBICO_DIR}/scripts/link.sh" -q -c "${moonraker_obico_cfg}"
else
"${MOONRAKER_OBICO_DIR}/scripts/link.sh" -q -n "${name}" -c "${moonraker_obico_cfg}"
fi
done done
} }