script: fix main_menu confirm result and refactor

scripts/ui/main_menu.sh

@@ -1,42 +1,33 @@
-#main_ui(){
+#!/bin/bash
-  #[ $KIAUH_UPDATE_REMIND="true" ] && kiauh_update_reminder
-#  top_border
-#  echo -e "|     $(title_msg "~~~~~~~~~~~~~~~ [ Main Menu ] ~~~~~~~~~~~~~~~")     |"
-#  hr
-#  echo -e "|  0) [Upload Log]     |       Klipper: $KLIPPER_STATUS|"
-#  echo -e "|                      |        Branch: ${cyan}$PRINT_BRANCH${default}|"
-#  echo -e "|  1) [Install]        |                                |"
-#  echo -e "|  2) [Update]         |     Moonraker: $MOONRAKER_STATUS|"
-#  echo -e "|  3) [Remove]         |                                |"
-#  echo -e "|  4) [Advanced]       |      Mainsail: $MAINSAIL_STATUS|"
-#  echo -e "|  5) [Backup]         |        Fluidd: $FLUIDD_STATUS|"
-#  echo -e "|                      | KlipperScreen: $KLIPPERSCREEN_STATUS|"
-#  echo -e "|  6) [Settings]       |  Telegram Bot: $MOONRAKER_TELEGRAM_BOT_STATUS|"
-#  echo -e "|                      |                                |"
-#  echo -e "|                      |          DWC2: $DWC2_STATUS|"
-#  echo -e "|  ${cyan}$KIAUH_VER${default}|     Octoprint: $OCTOPRINT_STATUS|"
-#  quit_footer
-#}
 
-print_kiauh_version(){
+print_kiauh_version() {
   cd ${SRCDIR}/kiauh
   KIAUH_VER=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
   KIAUH_VER="$(printf "%-20s" "$KIAUH_VER")"
 }
 
-kiauh_update_dialog(){
+#######################################
-  whiptail --title "New KIAUH update available!"\
+# description Advise user to update KIAUH
-  --yesno \
+# Globals:
-"View Changelog: https://git.io/JnmlX
+#   KIAUH_WHIPTAIL_NORMAL_HEIGHT
+#   KIAUH_WHIPTAIL_NORMAL_WIDTH
+#   RET
+# Arguments:
+#  None
+#######################################
+kiauh_update_dialog() {
+  whiptail --title "New KIAUH update available!" \
+    --yesno \
+    "View Changelog: https://git.io/JnmlX
 
 It is recommended to keep KIAUH up to date. Updates usually contain bugfixes, \
 important changes or new features. Please consider updating!
 
 Do you want to update now?" \
-  $KIAUH_WHIPTAIL_NORMAL_HEIGHT $KIAUH_WHIPTAIL_NORMAL_WIDTH
+    "$KIAUH_WHIPTAIL_NORMAL_HEIGHT" "$KIAUH_WHIPTAIL_NORMAL_WIDTH"
 
-  RET=$?
+  local out=$?
-  if [ $RET -eq 0 ]; then
+  if [ $out -eq 0 ]; then
     do_action "update_kiauh"
   else
     deny_action "kiauh_update_dialog"
@@ -66,15 +57,15 @@ main_menu() {
 Moonraker: $MOONRAKER_STATUS\n
 Mainsail: $MAINSAIL_STATUS Fluidd: $FLUIDD_STATUS
 KlipperScreen: $KLIPPERSCREEN_STATUS Telegram Bot: $MOONRAKER_TELEGRAM_BOT_STATUS
-DWC2: $DWC2_STATUS Octoprint: $OCTOPRINT_STATUS"
+DWC2: $DWC2_STATUS OctoPrint: $OCTOPRINT_STATUS"
-    local menu_choices=("1" "Install" "2" "Update" "3" "Remove" "4" "Advanced Settings" "5" "Backup" "6" "Settings" "7" "Upload Log")
+    local menu_choices=("1" "Install" "2" "Update" "3" "Remove" "4" "Advanced Settings" "5" "Backup" "6" "Settings" "7" "Upload Log" "8" "Service")
     local menu
     menu=$(whiptail --title "$KIAUH_TITLE $KIAUH_VER" --cancel-button "Finish" --notags --menu "$menu_str\n\nChoose an option:" \
       "$KIAUH_WHIPTAIL_NORMAL_HEIGHT" "$KIAUH_WHIPTAIL_NORMAL_WIDTH" 8 "${menu_choices[@]}" 3>&1 1>&2 2>&3)
     local out=$?
     if [ $out -eq 1 ]; then
     	break
-    elif [ $out -eq 1 ]; then
+    elif [ $out -eq 0 ]; then
 			case "$menu" in
 				1) install_menu ;;
 				2) update_menu ;;
@@ -83,42 +74,12 @@ DWC2: $DWC2_STATUS Octoprint: $OCTOPRINT_STATUS"
 				5) backup_menu ;;
 				6) settings_menu ;;
 				7) upload_selection ;;
+				8) service_menu;;
 			esac
 		else
+			# Unexpected event, no clue what happened
 			exit 1
 		fi
   done
 	echo -e "${green}###### Happy printing! ######${default}"; echo
-
-  #  while true; do
-  #    read -p "${cyan}Perform action:${default} " action; echo
-  #    case "$action" in
-  #      "start klipper") do_action_service "start" "klipper"; main_ui;;
-  #      "stop klipper") do_action_service "stop" "klipper"; main_ui;;
-  #      "restart klipper") do_action_service "restart" "klipper"; main_ui;;
-  #      "start moonraker") do_action_service "start" "moonraker"; main_ui;;
-  #      "stop moonraker") do_action_service "stop" "moonraker"; main_ui;;
-  #      "restart moonraker")do_action_service "restart" "moonraker"; main_ui;;
-  #      "start dwc") do_action_service "start" "dwc"; main_ui;;
-  #      "stop dwc") do_action_service "stop" "dwc"; main_ui;;
-  #      "restart dwc") do_action_service "restart" "dwc"; main_ui;;
-  #      "start octoprint") do_action_service "start" "octoprint"; main_ui;;
-  #      "stop octoprint") do_action_service "stop" "octoprint"; main_ui;;
-  #      "restart octoprint") do_action_service "restart" "octoprint"; main_ui;;
-  #      update) do_action "update_kiauh" "main_ui";;
-  #      0) do_action "upload_selection" "main_ui";;
-  #      1) clear && install_menu && break;;
-  #      2) clear && update_menu && break;;
-  #      3) clear && remove_menu && break;;
-  #      4) clear && advanced_menu && break;;
-  #      5) clear && backup_menu && break;;
-  #      6) clear && settings_menu && break;;
-  #      Q|q)
-  #        echo -e "${green}###### Happy printing! ######${default}"; echo
-  #        exit -1;;
-  #      *)
-  #        deny_action "main_ui";;
-  #    esac
-  #  done
-  #  clear; main_menu
 }