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

remove hint msg -> useless

Browse Source
This commit is contained in:
th33xitus
2020-07-26 18:10:45 +02:00
parent da57fe7ccc
commit 303c96cbb1
2 changed files with 51 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
kiauh.sh
View File

@@ -52,7 +52,7 @@ OCTOPRINT_CFG_DIR=${HOME}/.octoprint
OCTOPRINT_SERVICE1=/etc/init.d/octoprint OCTOPRINT_SERVICE1=/etc/init.d/octoprint
OCTOPRINT_SERVICE2=/etc/default/octoprint OCTOPRINT_SERVICE2=/etc/default/octoprint
#misc #misc
INI_DIR=${HOME}/kiauh/kiauh.ini INI_FILE=${HOME}/kiauh/kiauh.ini
BACKUP_DIR=${HOME}/kiauh-backups BACKUP_DIR=${HOME}/kiauh-backups
PRINTER_CFG=${HOME}/printer.cfg PRINTER_CFG=${HOME}/printer.cfg
@@ -75,13 +75,6 @@ print_msg(){
echo -e "#########################################################" echo -e "#########################################################"
echo -e "${default}" echo -e "${default}"
fi fi
if [[ "$HINT_MSG" != "" ]]; then
echo -e "${yellow}"
echo -e "#########################################################"
echo -e " $HINT_MSG "
echo -e "#########################################################"
echo -e "${default}"
fi
if [ "$CONFIRM_MSG" != "" ]; then if [ "$CONFIRM_MSG" != "" ]; then
echo -e "${green}" echo -e "${green}"
echo -e "#########################################################" echo -e "#########################################################"
@@ -91,6 +84,10 @@ print_msg(){
fi fi
} }
clear_msg(){
CONFIRM_MSG="" && ERROR_MSG=""
}
main_menu(){ main_menu(){
print_header print_header
#print KIAUH update msg if update available #print KIAUH update msg if update available
@@ -103,7 +100,7 @@ main_menu(){
mainsail_status mainsail_status
octoprint_status octoprint_status
print_branch print_branch
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
main_ui main_ui
while true; do while true; do
echo -e "${cyan}" echo -e "${cyan}"
@@ -114,13 +111,13 @@ main_menu(){
clear clear
print_header print_header
update_kiauh update_kiauh
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
main_ui;; main_ui;;
0) 0)
clear clear
print_header print_header
ERROR_MSG="Sorry this function is not implemented yet!" ERROR_MSG="Sorry this function is not implemented yet!"
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
main_ui;; main_ui;;
1) 1)
clear clear
@@ -149,7 +146,7 @@ main_menu(){
clear clear
print_header print_header
print_unkown_cmd print_unkown_cmd
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
main_ui;; main_ui;;
esac esac
done done
@@ -168,25 +165,25 @@ install_menu(){
clear clear
print_header print_header
install_klipper install_klipper
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
install_ui;; install_ui;;
2) 2)
clear clear
print_header print_header
dwc2_install_routine dwc2_install_routine
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
install_ui;; install_ui;;
3) 3)
clear clear
print_header print_header
mainsail_install_routine mainsail_install_routine
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
install_ui;; install_ui;;
4) 4)
clear clear
print_header print_header
octoprint_install_routine octoprint_install_routine
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
install_ui;; install_ui;;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;
@@ -194,7 +191,7 @@ install_menu(){
clear clear
print_header print_header
print_unkown_cmd print_unkown_cmd
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
install_ui;; install_ui;;
esac esac
done done
@@ -205,7 +202,7 @@ update_menu(){
print_header print_header
#compare versions #compare versions
ui_print_versions ui_print_versions
print_msg && CONFIRM_MSG="" && HINT_MSG="" && ERROR_MSG="" print_msg && clear_msg
read_bb4u_stat read_bb4u_stat
update_ui update_ui
while true; do while true; do
@@ -217,31 +214,31 @@ update_menu(){
clear clear
print_header print_header
toggle_backups toggle_backups
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
update_ui;; update_ui;;
1) 1)
clear clear
print_header print_header
update_klipper && ui_print_versions update_klipper && ui_print_versions
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
update_ui;; update_ui;;
2) 2)
clear clear
print_header print_header
update_dwc2fk && ui_print_versions update_dwc2fk && ui_print_versions
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
update_ui;; update_ui;;
3) 3)
clear clear
print_header print_header
update_dwc2 && ui_print_versions update_dwc2 && ui_print_versions
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
update_ui;; update_ui;;
4) 4)
clear clear
print_header print_header
update_mainsail && ui_print_versions update_mainsail && ui_print_versions
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
update_ui;; update_ui;;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;
@@ -249,7 +246,7 @@ update_menu(){
clear clear
print_header print_header
print_unkown_cmd print_unkown_cmd
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
ui_print_versions ui_print_versions
update_ui;; update_ui;;
esac esac
@@ -269,37 +266,37 @@ remove_menu(){
clear clear
print_header print_header
remove_klipper remove_klipper
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
remove_ui;; remove_ui;;
2) 2)
clear clear
print_header print_header
remove_dwc2 remove_dwc2
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
remove_ui;; remove_ui;;
3) 3)
clear clear
print_header print_header
remove_mainsail remove_mainsail
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
remove_ui;; remove_ui;;
4) 4)
clear clear
print_header print_header
remove_octoprint remove_octoprint
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
remove_ui;; remove_ui;;
5) 5)
clear clear
print_header print_header
remove_tornado remove_tornado
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
remove_ui;; remove_ui;;
6) 6)
clear clear
print_header print_header
remove_nginx remove_nginx
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
remove_ui;; remove_ui;;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;
@@ -307,7 +304,7 @@ remove_menu(){
clear clear
print_header print_header
print_unkown_cmd print_unkown_cmd
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
remove_ui;; remove_ui;;
esac esac
done done
@@ -316,7 +313,7 @@ remove_menu(){
advanced_menu(){ advanced_menu(){
print_header print_header
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
read_octoprint_service_status read_octoprint_service_status
advanced_ui advanced_ui
while true; do while true; do
@@ -329,49 +326,49 @@ advanced_menu(){
print_header print_header
toggle_octoprint_service toggle_octoprint_service
read_octoprint_service_status read_octoprint_service_status
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
1) 1)
clear clear
print_header print_header
switch_menu switch_menu
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
2) 2)
clear clear
print_header print_header
build_fw build_fw
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
3) 3)
clear clear
print_header print_header
flash_routine flash_routine
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
4) 4)
clear clear
print_header print_header
get_usb_id get_usb_id
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
5) 5)
clear clear
print_header print_header
get_usb_id && write_printer_id get_usb_id && write_printer_id
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
6) 6)
clear clear
print_header print_header
create_dwc2fk_cfg create_dwc2fk_cfg
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
7) 7)
clear clear
print_header print_header
create_custom_hostname create_custom_hostname
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;
@@ -379,7 +376,7 @@ advanced_menu(){
clear clear
print_header print_header
print_unkown_cmd print_unkown_cmd
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
advanced_ui;; advanced_ui;;
esac esac
done done
@@ -389,7 +386,7 @@ advanced_menu(){
switch_menu(){ switch_menu(){
if [ -d $KLIPPER_DIR ]; then if [ -d $KLIPPER_DIR ]; then
read_branch read_branch
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
switch_ui switch_ui
while true; do while true; do
echo -e "${cyan}" echo -e "${cyan}"
@@ -401,35 +398,35 @@ switch_menu(){
print_header print_header
switch_to_origin switch_to_origin
read_branch read_branch
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
switch_ui;; switch_ui;;
2) 2)
clear clear
print_header print_header
switch_to_scurve_shaping switch_to_scurve_shaping
read_branch read_branch
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
switch_ui;; switch_ui;;
3) 3)
clear clear
print_header print_header
switch_to_scurve_smoothing switch_to_scurve_smoothing
read_branch read_branch
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
switch_ui;; switch_ui;;
4) 4)
clear clear
print_header print_header
switch_to_moonraker switch_to_moonraker
read_branch read_branch
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
switch_ui;; switch_ui;;
5) 5)
clear clear
print_header print_header
switch_to_dev_moonraker switch_to_dev_moonraker
read_branch read_branch
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
switch_ui;; switch_ui;;
Q|q) Q|q)
clear; advanced_menu; break;; clear; advanced_menu; break;;
@@ -437,7 +434,7 @@ switch_menu(){
clear clear
print_header print_header
print_unkown_cmd print_unkown_cmd
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
switch_ui;; switch_ui;;
esac esac
done done
@@ -448,7 +445,7 @@ switch_menu(){
backup_menu(){ backup_menu(){
print_header print_header
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
backup_ui backup_ui
while true; do while true; do
echo -e "${cyan}" echo -e "${cyan}"
@@ -459,25 +456,25 @@ backup_menu(){
clear clear
print_header print_header
backup_klipper backup_klipper
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
backup_ui;; backup_ui;;
2) 2)
clear clear
print_header print_header
backup_dwc2 backup_dwc2
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
backup_ui;; backup_ui;;
3) 3)
clear clear
print_header print_header
backup_mainsail backup_mainsail
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
backup_ui;; backup_ui;;
4) 4)
clear clear
print_header print_header
backup_octoprint backup_octoprint
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
backup_ui;; backup_ui;;
Q|q) Q|q)
clear; main_menu; break;; clear; main_menu; break;;
@@ -485,7 +482,7 @@ backup_menu(){
clear clear
print_header print_header
print_unkown_cmd print_unkown_cmd
print_msg && CONFIRM_MSG="" && ERROR_MSG="" print_msg && clear_msg
backup_ui;; backup_ui;;
esac esac
done done

4
scripts/status.sh
View File

@@ -162,7 +162,6 @@ read_remote_klipper_commit(){
REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH) REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH)
else else
REMOTE_COMMIT="${red}--------${default}" REMOTE_COMMIT="${red}--------${default}"
HINT_MSG="Can't fetch all remote versions!\n No git repo available or curl not installed!"
fi fi
} }
@@ -189,7 +188,6 @@ read_dwc2fk_versions(){
else else
LOCAL_DWC2FK_COMMIT="${red}--------${default}" LOCAL_DWC2FK_COMMIT="${red}--------${default}"
REMOTE_DWC2FK_COMMIT="${red}--------${default}" REMOTE_DWC2FK_COMMIT="${red}--------${default}"
HINT_MSG="Can't fetch all remote versions!\n No git repo available or curl not installed!"
fi fi
} }
@@ -218,7 +216,6 @@ read_remote_dwc2_version(){
#remote checks don't work without curl installed! #remote checks don't work without curl installed!
if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
DWC2_REMOTE_VER="${red}-----${default}" DWC2_REMOTE_VER="${red}-----${default}"
HINT_MSG="Can't fetch all remote versions!\n No git repo available or curl not installed!"
else else
DWC2_REMOTE_VER=$(curl -s https://api.github.com/repositories/28820678/releases/latest | grep tag_name | cut -d'"' -f4) DWC2_REMOTE_VER=$(curl -s https://api.github.com/repositories/28820678/releases/latest | grep tag_name | cut -d'"' -f4)
fi fi
@@ -250,7 +247,6 @@ read_remote_mainsail_version(){
#remote checks don't work without curl installed! #remote checks don't work without curl installed!
if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then if [[ ! $(dpkg-query -f'${Status}' --show curl 2>/dev/null) = *\ installed ]]; then
MAINSAIL_REMOTE_VER="${red}------${default}" MAINSAIL_REMOTE_VER="${red}------${default}"
HINT_MSG="Can't fetch all remote versions!\n No git repo available or curl not installed!"
else else
get_mainsail_ver get_mainsail_ver
MAINSAIL_REMOTE_VER=$MAINSAIL_VERSION MAINSAIL_REMOTE_VER=$MAINSAIL_VERSION