diff --git a/kiauh.sh b/kiauh.sh index 200b427..670707e 100755 --- a/kiauh.sh +++ b/kiauh.sh @@ -63,7 +63,7 @@ get_date(){ current_date=$(date +"%Y-%m-%d_%H-%M") } print_unkown_cmd(){ - ERROR_MSG=" Sorry i don't know that command!" + ERROR_MSG="Invalid command!" } print_msg(){ diff --git a/scripts/functions.sh b/scripts/functions.sh index 7202f52..2bc71de 100755 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -222,7 +222,11 @@ remove_branding(){ ok_msg "Clear browser cache and reload Mainsail (F5)!" echo break;; - N|n|No|no) break;; + N|n|No|no) + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done } @@ -258,6 +262,9 @@ install_extension_shell_command(){ break;; N|n|No|no) break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done } diff --git a/scripts/install_dwc2.sh b/scripts/install_dwc2.sh index dd1e07c..f7651d9 100755 --- a/scripts/install_dwc2.sh +++ b/scripts/install_dwc2.sh @@ -81,9 +81,12 @@ get_user_selections_dwc2(){ echo -e "###### > Skip" SEL_DEF_CFG="false" SEL_CUS_CFG="false" - echo "${red}Skipping ...${default}"; break;; + echo "${red}Skipping ...${default}" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done fi # @@ -107,12 +110,16 @@ get_user_selections_dwc2(){ case "$yn" in Y|y|Yes|yes|"") echo -e "###### > Yes" - DISABLE_OPRINT="true";; + DISABLE_OPRINT="true" + break;; N|n|No|no) echo -e "###### > No" - DISABLE_OPRINT="false";; + DISABLE_OPRINT="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done fi status_msg "Installation will start now! Please wait ..." @@ -328,6 +335,9 @@ DWC2 CONFIRM_CUSTOM_CFG="false" create_custom_dwc2_printer_cfg break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done } @@ -352,6 +362,9 @@ dwc2_reverse_proxy_dialog(){ N|n|No|no|"") SET_REVERSE_PROXY="false" break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done } \ No newline at end of file diff --git a/scripts/install_klipper.sh b/scripts/install_klipper.sh index b693e10..ef476ef 100755 --- a/scripts/install_klipper.sh +++ b/scripts/install_klipper.sh @@ -25,6 +25,9 @@ get_user_selections_klipper(){ echo -e "###### > No" BUILD_FIRMWARE="false" break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done #ask user for flashing mcu @@ -41,6 +44,9 @@ get_user_selections_klipper(){ echo -e "###### > No" FLASH_FIRMWARE="false" break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done } @@ -93,6 +99,9 @@ flash_routine(){ CONFIRM_FLASHING="false" CONFIRM_WRITE_PRINTER_USB="false" break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done fi diff --git a/scripts/install_moonraker.sh b/scripts/install_moonraker.sh index a2e9662..909452f 100755 --- a/scripts/install_moonraker.sh +++ b/scripts/install_moonraker.sh @@ -81,12 +81,16 @@ get_user_selections_moonraker(){ case "$yn" in Y|y|Yes|yes|"") echo -e "###### > Yes" - INST_MAINSAIL="true";; + INST_MAINSAIL="true" + break;; N|n|No|no) echo -e "###### > No" - INST_MAINSAIL="false";; + INST_MAINSAIL="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done #ask to change hostname if mainsail should be installed as well if [ "$INST_MAINSAIL" = "true" ]; then @@ -110,12 +114,16 @@ get_user_selections_moonraker(){ case "$yn" in Y|y|Yes|yes|"") echo -e "###### > Yes" - SEL_DEF_CFG="true";; + SEL_DEF_CFG="true" + break;; N|n|No|no) echo -e "###### > No" - SEL_DEF_CFG="false";; + SEL_DEF_CFG="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done fi #user selection for moonraker.log symlink @@ -126,12 +134,16 @@ get_user_selections_moonraker(){ case "$yn" in Y|y|Yes|yes|"") echo -e "###### > Yes" - SEL_KLIPPYLOG_SL="true";; + SEL_KLIPPYLOG_SL="true" + break;; N|n|No|no) echo -e "###### > No" - SEL_KLIPPYLOG_SL="false";; + SEL_KLIPPYLOG_SL="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done fi #user selection for moonraker.log symlink @@ -142,12 +154,16 @@ get_user_selections_moonraker(){ case "$yn" in Y|y|Yes|yes|"") echo -e "###### > Yes" - SEL_MRLOG_SL="true";; + SEL_MRLOG_SL="true" + break;; N|n|No|no) echo -e "###### > No" - SEL_MRLOG_SL="false";; + SEL_MRLOG_SL="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done fi #ask user for more trusted clients @@ -163,12 +179,15 @@ get_user_selections_moonraker(){ echo -e "###### > Yes" ADD_TRUSTED_CLIENT="true" custom_trusted_clients - ;; + break;; N|n|No|no|"") echo -e "###### > No" - ADD_TRUSTED_CLIENT="false";; + ADD_TRUSTED_CLIENT="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done #ask user for mainsail default macros while true; do @@ -178,12 +197,16 @@ get_user_selections_moonraker(){ case "$yn" in Y|y|Yes|yes|"") echo -e "###### > Yes" - ADD_MS_MACROS="true";; + ADD_MS_MACROS="true" + break;; N|n|No|no) echo -e "###### > No" - ADD_MS_MACROS="false";; + ADD_MS_MACROS="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done #ask user to disable octoprint when such installed service was found if [ "$OCTOPRINT_ENABLED" = "true" ]; then @@ -198,12 +221,16 @@ get_user_selections_moonraker(){ case "$yn" in Y|y|Yes|yes|"") echo -e "###### > Yes" - DISABLE_OPRINT="true";; + DISABLE_OPRINT="true" + break;; N|n|No|no) echo -e "###### > No" - DISABLE_OPRINT="false";; + DISABLE_OPRINT="false" + break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac - break done fi #notify user about haproxy or lighttpd services found and possible issues @@ -541,7 +568,9 @@ custom_trusted_clients(){ esac done break;; - *) trusted_arr+=($TRUSTED_IP);; + *) + trusted_arr+=($TRUSTED_IP) + break;; esac done fi diff --git a/scripts/install_octoprint.sh b/scripts/install_octoprint.sh index cc049ba..0df8495 100755 --- a/scripts/install_octoprint.sh +++ b/scripts/install_octoprint.sh @@ -133,6 +133,9 @@ octoprint_reverse_proxy_dialog(){ N|n|No|no|"") SET_REVERSE_PROXY="false" break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done } diff --git a/scripts/remove.sh b/scripts/remove.sh index 558b8b6..8390d4b 100755 --- a/scripts/remove.sh +++ b/scripts/remove.sh @@ -87,6 +87,9 @@ remove_moonraker(){ echo -e "###### > No" REMOVE_MOONRAKER_CONF="false" break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done fi diff --git a/scripts/rollback.sh b/scripts/rollback.sh index a61c049..713364f 100755 --- a/scripts/rollback.sh +++ b/scripts/rollback.sh @@ -83,6 +83,9 @@ rollback_klipper(){ break;; N|n|No|no) clear; advanced_menu; break;; Q|q) clear; advanced_menu; break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done else diff --git a/scripts/set_reverse_proxy.sh b/scripts/set_reverse_proxy.sh index b9164a1..f024801 100755 --- a/scripts/set_reverse_proxy.sh +++ b/scripts/set_reverse_proxy.sh @@ -41,6 +41,9 @@ create_custom_hostname(){ user_input_hostname break;; N|n|No|no|"") break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done } @@ -73,6 +76,9 @@ user_input_hostname(){ echo -e "${red}Skip hostname change ...${default}" HOSTENAME_CONFIRM="false" break;; + *) + print_unkown_cmd + print_msg && clear_msg;; esac done break