jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-12 18:14:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: rework dialogues to display invalid input

Browse Source
This commit is contained in:
th33xitus
2020-09-11 14:12:49 +02:00
parent 4d53a92c83
commit b576491320
9 changed files with 102 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kiauh.sh
View File

@@ -63,7 +63,7 @@ get_date(){
current_date=$(date +"%Y-%m-%d_%H-%M") current_date=$(date +"%Y-%m-%d_%H-%M")
} }
print_unkown_cmd(){ print_unkown_cmd(){
ERROR_MSG=" Sorry i don't know that command!" ERROR_MSG="Invalid command!"
} }
print_msg(){ print_msg(){

9
scripts/functions.sh
View File

@@ -222,7 +222,11 @@ remove_branding(){
ok_msg "Clear browser cache and reload Mainsail (F5)!" ok_msg "Clear browser cache and reload Mainsail (F5)!"
echo echo
break;; break;;
N|n|No|no) break;; N|n|No|no)
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
} }
@@ -258,6 +262,9 @@ install_extension_shell_command(){
break;; break;;
N|n|No|no) N|n|No|no)
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
} }

23
scripts/install_dwc2.sh
View File

@@ -81,9 +81,12 @@ get_user_selections_dwc2(){
echo -e "###### > Skip" echo -e "###### > Skip"
SEL_DEF_CFG="false" SEL_DEF_CFG="false"
SEL_CUS_CFG="false" SEL_CUS_CFG="false"
echo "${red}Skipping ...${default}"; break;; echo "${red}Skipping ...${default}"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
fi fi
# #
@@ -107,12 +110,16 @@ get_user_selections_dwc2(){
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
DISABLE_OPRINT="true";; DISABLE_OPRINT="true"
break;;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
DISABLE_OPRINT="false";; DISABLE_OPRINT="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
fi fi
status_msg "Installation will start now! Please wait ..." status_msg "Installation will start now! Please wait ..."
@@ -328,6 +335,9 @@ DWC2
CONFIRM_CUSTOM_CFG="false" CONFIRM_CUSTOM_CFG="false"
create_custom_dwc2_printer_cfg create_custom_dwc2_printer_cfg
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
} }
@@ -352,6 +362,9 @@ dwc2_reverse_proxy_dialog(){
N|n|No|no|"") N|n|No|no|"")
SET_REVERSE_PROXY="false" SET_REVERSE_PROXY="false"
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
} }

9
scripts/install_klipper.sh
View File

@@ -25,6 +25,9 @@ get_user_selections_klipper(){
echo -e "###### > No" echo -e "###### > No"
BUILD_FIRMWARE="false" BUILD_FIRMWARE="false"
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
#ask user for flashing mcu #ask user for flashing mcu
@@ -41,6 +44,9 @@ get_user_selections_klipper(){
echo -e "###### > No" echo -e "###### > No"
FLASH_FIRMWARE="false" FLASH_FIRMWARE="false"
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
} }
@@ -93,6 +99,9 @@ flash_routine(){
CONFIRM_FLASHING="false" CONFIRM_FLASHING="false"
CONFIRM_WRITE_PRINTER_USB="false" CONFIRM_WRITE_PRINTER_USB="false"
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
fi fi

73
scripts/install_moonraker.sh
View File

@@ -81,12 +81,16 @@ get_user_selections_moonraker(){
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
INST_MAINSAIL="true";; INST_MAINSAIL="true"
break;;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
INST_MAINSAIL="false";; INST_MAINSAIL="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
#ask to change hostname if mainsail should be installed as well #ask to change hostname if mainsail should be installed as well
if [ "$INST_MAINSAIL" = "true" ]; then if [ "$INST_MAINSAIL" = "true" ]; then
@@ -110,12 +114,16 @@ get_user_selections_moonraker(){
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
SEL_DEF_CFG="true";; SEL_DEF_CFG="true"
break;;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
SEL_DEF_CFG="false";; SEL_DEF_CFG="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
fi fi
#user selection for moonraker.log symlink #user selection for moonraker.log symlink
@@ -126,12 +134,16 @@ get_user_selections_moonraker(){
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
SEL_KLIPPYLOG_SL="true";; SEL_KLIPPYLOG_SL="true"
break;;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
SEL_KLIPPYLOG_SL="false";; SEL_KLIPPYLOG_SL="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
fi fi
#user selection for moonraker.log symlink #user selection for moonraker.log symlink
@@ -142,12 +154,16 @@ get_user_selections_moonraker(){
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
SEL_MRLOG_SL="true";; SEL_MRLOG_SL="true"
break;;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
SEL_MRLOG_SL="false";; SEL_MRLOG_SL="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
fi fi
#ask user for more trusted clients #ask user for more trusted clients
@@ -163,12 +179,15 @@ get_user_selections_moonraker(){
echo -e "###### > Yes" echo -e "###### > Yes"
ADD_TRUSTED_CLIENT="true" ADD_TRUSTED_CLIENT="true"
custom_trusted_clients custom_trusted_clients
;; break;;
N|n|No|no|"") N|n|No|no|"")
echo -e "###### > No" echo -e "###### > No"
ADD_TRUSTED_CLIENT="false";; ADD_TRUSTED_CLIENT="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
#ask user for mainsail default macros #ask user for mainsail default macros
while true; do while true; do
@@ -178,12 +197,16 @@ get_user_selections_moonraker(){
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
ADD_MS_MACROS="true";; ADD_MS_MACROS="true"
break;;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
ADD_MS_MACROS="false";; ADD_MS_MACROS="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
#ask user to disable octoprint when such installed service was found #ask user to disable octoprint when such installed service was found
if [ "$OCTOPRINT_ENABLED" = "true" ]; then if [ "$OCTOPRINT_ENABLED" = "true" ]; then
@@ -198,12 +221,16 @@ get_user_selections_moonraker(){
case "$yn" in case "$yn" in
Y|y|Yes|yes|"") Y|y|Yes|yes|"")
echo -e "###### > Yes" echo -e "###### > Yes"
DISABLE_OPRINT="true";; DISABLE_OPRINT="true"
break;;
N|n|No|no) N|n|No|no)
echo -e "###### > No" echo -e "###### > No"
DISABLE_OPRINT="false";; DISABLE_OPRINT="false"
break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
break
done done
fi fi
#notify user about haproxy or lighttpd services found and possible issues #notify user about haproxy or lighttpd services found and possible issues
@@ -541,7 +568,9 @@ custom_trusted_clients(){
esac esac
done done
break;; break;;
*) trusted_arr+=($TRUSTED_IP);; *)
trusted_arr+=($TRUSTED_IP)
break;;
esac esac
done done
fi fi

3
scripts/install_octoprint.sh
View File

@@ -133,6 +133,9 @@ octoprint_reverse_proxy_dialog(){
N|n|No|no|"") N|n|No|no|"")
SET_REVERSE_PROXY="false" SET_REVERSE_PROXY="false"
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
} }

3
scripts/remove.sh
View File

@@ -87,6 +87,9 @@ remove_moonraker(){
echo -e "###### > No" echo -e "###### > No"
REMOVE_MOONRAKER_CONF="false" REMOVE_MOONRAKER_CONF="false"
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
fi fi

3
scripts/rollback.sh
View File

@@ -83,6 +83,9 @@ rollback_klipper(){
break;; break;;
N|n|No|no) clear; advanced_menu; break;; N|n|No|no) clear; advanced_menu; break;;
Q|q) clear; advanced_menu; break;; Q|q) clear; advanced_menu; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
else else

6
scripts/set_reverse_proxy.sh
View File

@@ -41,6 +41,9 @@ create_custom_hostname(){
user_input_hostname user_input_hostname
break;; break;;
N|n|No|no|"") break;; N|n|No|no|"") break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
} }
@@ -73,6 +76,9 @@ user_input_hostname(){
echo -e "${red}Skip hostname change ...${default}" echo -e "${red}Skip hostname change ...${default}"
HOSTENAME_CONFIRM="false" HOSTENAME_CONFIRM="false"
break;; break;;
*)
print_unkown_cmd
print_msg && clear_msg;;
esac esac
done done
break break