diff --git a/kiauh.sh b/kiauh.sh index 66cda5e..bc9a8eb 100755 --- a/kiauh.sh +++ b/kiauh.sh @@ -130,7 +130,7 @@ main_menu(){ *) clear print_header - ERROR_MSG=" Unknown command '$action'" + ERROR_MSG=" Sorry, i don't know that command!" print_msg && CONFIRM_MSG="" && ERROR_MSG="" main_ui;; esac @@ -173,7 +173,7 @@ install_menu(){ *) clear print_header - ERROR_MSG=" Unknown command '$action'" + ERROR_MSG=" Sorry, i don't know that command!" print_msg && CONFIRM_MSG="" && ERROR_MSG="" install_ui;; esac @@ -226,7 +226,7 @@ update_menu(){ *) clear print_header - ERROR_MSG=" Unknown command '$action'" + ERROR_MSG=" Sorry, i don't know that command!" print_msg && CONFIRM_MSG="" && ERROR_MSG="" ui_print_versions update_ui;; @@ -270,7 +270,7 @@ remove_menu(){ *) clear print_header - ERROR_MSG=" Unknown command '$action'" + ERROR_MSG=" Sorry, i don't know that command!" print_msg && CONFIRM_MSG="" && ERROR_MSG="" remove_ui;; esac @@ -334,7 +334,7 @@ advanced_menu(){ *) clear print_header - ERROR_MSG=" Unknown command '$action'" + ERROR_MSG=" Sorry, i don't know that command!" print_msg && CONFIRM_MSG="" && ERROR_MSG="" advanced_ui;; esac @@ -412,7 +412,7 @@ backup_menu(){ *) clear print_header - ERROR_MSG=" Unknown command '$action'" + ERROR_MSG=" Sorry, i don't know that command!" print_msg && CONFIRM_MSG="" && ERROR_MSG="" backup_ui;; esac diff --git a/scripts/remove.sh b/scripts/remove.sh index fd6cdf1..6404a3c 100644 --- a/scripts/remove.sh +++ b/scripts/remove.sh @@ -22,7 +22,7 @@ remove_klipper(){ status_msg "Removing klippy.log Symlink ..." rm -rf ${HOME}/klippy.log /tmp/klippy.log && ok_msg "Symlink removed!" fi - ok_msg "Klipper successfully removed!" + CONFIRM_MSG=" Klipper successfully removed!" fi } @@ -52,7 +52,7 @@ remove_dwc2(){ status_msg "Removing DWC2 directory ..." rm -rf $DWC2_DIR && ok_msg "Directory removed!" fi - ok_msg "DWC2-for-Klipper & DWC2 Web UI successfully removed!" + CONFIRM_MSG=" DWC2-for-Klipper & DWC2 Web UI successfully removed!" fi } @@ -112,7 +112,7 @@ remove_mainsail(){ status_msg "Removing API Key ..." rm ${HOME}/.moonraker_api_key && ok_msg "Done!" fi - ok_msg "Mainsail successfully removed!" + CONFIRM_MSG=" Mainsail successfully removed!" fi } @@ -144,6 +144,6 @@ remove_octoprint(){ status_msg "Removing octoprint.log Symlink ..." rm -rf ${HOME}/octoprint.log && ok_msg "Symlink removed!" fi - ok_msg "OctoPrint successfully removed!"; echo + CONFIRM_MSG=" OctoPrint successfully removed!" fi } \ No newline at end of file diff --git a/scripts/status.sh b/scripts/status.sh index 04654fa..aeb28d5 100644 --- a/scripts/status.sh +++ b/scripts/status.sh @@ -58,8 +58,6 @@ mainsail_status(){ #${HOME}/moonraker-env /etc/nginx/sites-available/mainsail /etc/nginx/sites-enabled/mainsail - /etc/init.d/nginx - /etc/default/nginx ) #count+1 for each found data-item from array for md in "${mainsail_data[@]}"