From 22888f57566ee9017edfce53c53c2d56f144c7b1 Mon Sep 17 00:00:00 2001 From: th33xitus <> Date: Sat, 25 Jul 2020 20:57:32 +0200 Subject: [PATCH] simple startup update check for KIAUH --- kiauh.sh | 13 ++++++++++++- scripts/status.sh | 13 +++++++++++++ scripts/ui.sh | 7 +++++++ scripts/update.sh | 8 ++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/kiauh.sh b/kiauh.sh index 1524c63..190ad98 100755 --- a/kiauh.sh +++ b/kiauh.sh @@ -93,19 +93,29 @@ print_msg(){ main_menu(){ print_header - print_msg && CONFIRM_MSG="" && ERROR_MSG="" + #print KIAUH update msg if update available + if [ $KIAUH_UPDATE_AVAIL = 1 ]; then + kiauh_update_msg + fi #check install status klipper_status dwc2_status mainsail_status octoprint_status print_branch + print_msg && CONFIRM_MSG="" && ERROR_MSG="" main_ui while true; do echo -e "${cyan}" read -p "Perform action: " action; echo echo -e "${default}" case "$action" in + update) + clear + print_header + update_kiauh + print_msg && CONFIRM_MSG="" && ERROR_MSG="" + main_ui;; 0) clear print_header @@ -487,4 +497,5 @@ SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )" for script in ${SRCDIR}/kiauh/scripts/*; do . $script; done check_euid +kiauh_status main_menu \ No newline at end of file diff --git a/scripts/status.sh b/scripts/status.sh index dfc6335..ac74d77 100644 --- a/scripts/status.sh +++ b/scripts/status.sh @@ -1,3 +1,16 @@ +kiauh_status(){ + cd ${HOME}/kiauh + #get local state + LOCAL_KIAUH_COMMIT=$(git rev-parse --short=8 HEAD) + #REMOTE_KIAUH_COMMIT=$(git rev-parse --short=8 origin/master) + REMOTE_KIAUH_COMMIT=$(git rev-parse --short=8 dev-2.0) + if [ "$LOCAL_KIAUH_COMMIT" != "$REMOTE_KIAUH_COMMIT" ]; then + KIAUH_UPDATE_AVAIL=1 + else + KIAUH_UPDATE_AVAIL=0 + fi +} + klipper_status(){ kcount=0 klipper_data=( diff --git a/scripts/ui.sh b/scripts/ui.sh index 5ddd738..97fba1d 100644 --- a/scripts/ui.sh +++ b/scripts/ui.sh @@ -154,4 +154,11 @@ switch_ui(){ echo -e "| 4) [--> moonraker] | " echo -e "| 5) [--> dev-moonraker] | " quit_footer +} + +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} | " + bottom_border } \ No newline at end of file diff --git a/scripts/update.sh b/scripts/update.sh index 1cb3446..7d8f258 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -6,6 +6,14 @@ update_check(){ read_remote_commit } +update_kiauh(){ + if [ $KIAUH_UPDATE_AVAIL = 1 ]; then + status_msg "Updating KIAUH ..." + cd ${HOME}/kiauh + git pull && ok_msg "Update complete! Please restart KIAUH."; echo + fi +} + update_klipper(){ stop_klipper bb4u "klipper"