From e00d2951a98cf7aecf2c6fdec0abb8b717bfae22 Mon Sep 17 00:00:00 2001 From: th33xitus <> Date: Sun, 16 Aug 2020 10:19:58 +0200 Subject: [PATCH] fix: bug in klipper version check --- kiauh.sh | 0 resources/favicon.ico | Bin scripts/install_octoprint.sh | 0 scripts/rollback.sh | 0 scripts/status.sh | 7 ++++--- 5 files changed, 4 insertions(+), 3 deletions(-) mode change 100755 => 100644 kiauh.sh mode change 100755 => 100644 resources/favicon.ico mode change 100755 => 100644 scripts/install_octoprint.sh mode change 100755 => 100644 scripts/rollback.sh diff --git a/kiauh.sh b/kiauh.sh old mode 100755 new mode 100644 diff --git a/resources/favicon.ico b/resources/favicon.ico old mode 100755 new mode 100644 diff --git a/scripts/install_octoprint.sh b/scripts/install_octoprint.sh old mode 100755 new mode 100644 diff --git a/scripts/rollback.sh b/scripts/rollback.sh old mode 100755 new mode 100644 diff --git a/scripts/status.sh b/scripts/status.sh index 8a33bae..f454f89 100644 --- a/scripts/status.sh +++ b/scripts/status.sh @@ -176,12 +176,13 @@ read_local_klipper_commit(){ read_remote_klipper_commit(){ read_branch if [ ! -z "$GET_BRANCH" ];then - if [[ "$GET_BRANCH" == "origin/master" || "master" ]]; then - git fetch origin master -q + if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "master" ]; then + git fetch origin -q + REMOTE_COMMIT=$(git rev-parse --short=8 origin) else git fetch $(echo "$GET_BRANCH" | cut -d"/" -f1) -q + REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH) fi - REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH) else REMOTE_COMMIT="${red}--------${default}" fi