From d6596d0a3dfe67b2972bfd982eef23dddda51e2a Mon Sep 17 00:00:00 2001 From: th33xitus Date: Thu, 8 Apr 2021 18:07:30 +0200 Subject: [PATCH] script: change kiauh update notification to a dialog --- scripts/ui/general_ui.sh | 16 ++++++++-------- scripts/ui/main_menu.sh | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/scripts/ui/general_ui.sh b/scripts/ui/general_ui.sh index e871c9a..47c55d7 100755 --- a/scripts/ui/general_ui.sh +++ b/scripts/ui/general_ui.sh @@ -31,17 +31,17 @@ print_header(){ kiauh_update_msg(){ top_border - echo -e "| ${yellow}There is a newer version of this script available!${default} | " - echo -e "| ${yellow}Type 'update' if you want to update KIAUH now.${default} | " - blank_line - echo -e "| ${yellow}Check out the KIAUH changelog for important changes${default} | " - echo -e "| ${yellow}either to the script or the installable components!${default} | " + echo -e "|${green} New KIAUH update available! ${default}| " + hr + echo -e "|${yellow} It is recommended to keep KIAUH up to date. Updates ${default}| " + echo -e "|${yellow} usually contain bugfixes, important changes or new ${default}| " + echo -e "|${yellow} features. Please consider updating! ${default}| " bottom_border } -############################################################################################## -#********************************************************************************************# -############################################################################################## +################################################################################ +#******************************************************************************# +################################################################################ ### TODO: rework other menus to make use of the following functions too and make them more readable do_action(){ diff --git a/scripts/ui/main_menu.sh b/scripts/ui/main_menu.sh index bf28ea8..cd26827 100755 --- a/scripts/ui/main_menu.sh +++ b/scripts/ui/main_menu.sh @@ -1,4 +1,5 @@ main_ui(){ + #[ $KIAUH_UPDATE_REMIND="true" ] && kiauh_update_reminder top_border echo -e "| $(title_msg "~~~~~~~~~~~~~~~ [ Main Menu ] ~~~~~~~~~~~~~~~") |" hr @@ -22,11 +23,26 @@ print_kiauh_version(){ KIAUH_VER="$(printf "%-20s" "$KIAUH_VER")" } +kiauh_update_dialog(){ + kiauh_update_msg + read -p "${cyan}Do you want to update now? (Y/n):${default} " yn + while true; do + case "$yn" in + Y|y|Yes|yes|"") + do_action "update_kiauh" + break;; + N|n|No|no) break;; + *) + deny_action "kiauh_update_dialog";; + esac + done +} + main_menu(){ print_header #print KIAUH update msg if update available if [ "$KIAUH_UPDATE_AVAIL" = "true" ]; then - kiauh_update_msg + kiauh_update_dialog fi #check install status print_kiauh_version