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

fix: a fix for the detached HEAD issue when updating klipper that was introduced in a past commit. the user now gets a warn message that he needs to force update klipper. behind the scenes he will be brought back onto the branch and head gets reattached.

Browse Source
This commit is contained in:
th33xitus
2020-12-22 20:39:12 +01:00
parent 1fd839bc7a
commit 240746e1b6
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/status.sh
View File

@@ -188,6 +188,11 @@ read_branch(){
if [ -d $KLIPPER_DIR/.git ]; then if [ -d $KLIPPER_DIR/.git ]; then
cd $KLIPPER_DIR cd $KLIPPER_DIR
GET_BRANCH="$(git branch | grep "*" | cut -d"*" -f2 | cut -d" " -f2)" GET_BRANCH="$(git branch | grep "*" | cut -d"*" -f2 | cut -d" " -f2)"
#try to fix a detached head state and read the correct branch from the output you get
if [ "$(echo $GET_BRANCH | grep "HEAD" )" ]; then
DETACHED_HEAD="true"
GET_BRANCH=$(git branch | grep "HEAD" | rev | cut -d" " -f1 | rev | cut -d")" -f1 | cut -d"/" -f2)
fi
else else
GET_BRANCH="" GET_BRANCH=""
fi fi
@@ -243,6 +248,10 @@ compare_klipper_versions(){
REMOTE_COMMIT="${green}$(printf "%-12s" "$REMOTE_COMMIT")${default}" REMOTE_COMMIT="${green}$(printf "%-12s" "$REMOTE_COMMIT")${default}"
KLIPPER_UPDATE_AVAIL="false" KLIPPER_UPDATE_AVAIL="false"
fi fi
#if detached head was found, force the user with warn message to update klipper
if [ "$DETACHED_HEAD" == "true" ]; then
LOCAL_COMMIT="${red}$(printf "%-12s" "Need update!")${default}"
fi
} }
############################################################# #############################################################

7
scripts/update.sh
View File

@@ -66,7 +66,12 @@ update_klipper(){
read_branch read_branch
save_klipper_state save_klipper_state
status_msg "Updating $GET_BRANCH" status_msg "Updating $GET_BRANCH"
cd $KLIPPER_DIR && git pull && ok_msg "Update successfull!" cd $KLIPPER_DIR
if [ "$DETACHED_HEAD" == "true" ]; then
git checkout $GET_BRANCH
unset DETACHED_HEAD
fi
git pull && ok_msg "Update successfull!"
#check for possible new dependencies and install them #check for possible new dependencies and install them
status_msg "Checking for possible new dependencies ..." status_msg "Checking for possible new dependencies ..."