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

new way of reading current active klipper branch

Browse Source
This commit is contained in:
th33xitus
2020-08-04 23:27:51 +02:00
parent 3ec26ba319
commit 9fcbcfcba8
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/status.sh
View File

@@ -3,9 +3,9 @@ kiauh_status(){
#get remote state #get remote state
git fetch origin master -q git fetch origin master -q
REMOTE_KIAUH_COMMIT=$(git rev-parse --short=8 origin/master) REMOTE_KIAUH_COMMIT=$(git rev-parse --short=8 origin/master)
#REMOTE_KIAUH_COMMIT=$(git rev-parse --short=8 dev-2.0)
#get local state #get local state
LOCAL_KIAUH_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_KIAUH_COMMIT=$(git rev-parse --short=8 HEAD)
#REMOTE_KIAUH_COMMIT=$(git rev-parse --short=8 dev-2.0)
if [ "$LOCAL_KIAUH_COMMIT" != "$REMOTE_KIAUH_COMMIT" ]; then if [ "$LOCAL_KIAUH_COMMIT" != "$REMOTE_KIAUH_COMMIT" ]; then
KIAUH_UPDATE_AVAIL=1 KIAUH_UPDATE_AVAIL=1
else else
@@ -66,9 +66,7 @@ mainsail_status(){
$MOONRAKER_SERVICE1 $MOONRAKER_SERVICE1
$MOONRAKER_SERVICE2 $MOONRAKER_SERVICE2
$MAINSAIL_DIR $MAINSAIL_DIR
#${HOME}/.klippy_api_key $MOONRAKER_ENV_DIR
#${HOME}/.moonraker_api_key
#${HOME}/moonraker-env
/etc/nginx/sites-available/mainsail /etc/nginx/sites-available/mainsail
/etc/nginx/sites-enabled/mainsail /etc/nginx/sites-enabled/mainsail
) )
@@ -112,14 +110,27 @@ octoprint_status(){
fi fi
} }
#read_branch(){
# if [ -d $KLIPPER_DIR ] && [ -d $KLIPPER_DIR/.git ]; then
# cd $KLIPPER_DIR
# GET_BRANCH=$(git branch -a | head -1 | cut -d " " -f5 | cut -d ")" -f1)
# #if reading the branch gives an empty string
# #we are on non-detached HEAD state on origin/master
# #and need to set GET_BRANCH to make a non-empty string
# if [ -z "$GET_BRANCH" ]; then
# GET_BRANCH="origin/master"
# fi
# else
# GET_BRANCH=""
# fi
#}
#reading the log for the last branch that got checked out assuming that this is also the currently active branch.
read_branch(){ read_branch(){
if [ -d $KLIPPER_DIR ] && [ -d $KLIPPER_DIR/.git ]; then if [ -d $KLIPPER_DIR/.git ]; then
cd $KLIPPER_DIR GET_BRANCH=$(cat ~/klipper/.git/logs/HEAD | grep "checkout" | tail -1 | sed "s/^.*to //")
GET_BRANCH=$(git branch -a | head -1 | cut -d " " -f5 | cut -d ")" -f1) #if the log file is empty, we can assume that klipper just got cloned and therefore is still on origin/master
#if reading the branch gives an empty string if [[ -z $(cat ~/klipper/.git/logs/HEAD) ]]; then
#we are on non-detached HEAD state on origin/master
#and need to set GET_BRANCH to make a non-empty string
if [ -z "$GET_BRANCH" ]; then
GET_BRANCH="origin/master" GET_BRANCH="origin/master"
fi fi
else else
@@ -127,6 +138,7 @@ read_branch(){
fi fi
} }
#prints the current klipper branch in the main menu
print_branch(){ print_branch(){
read_branch read_branch
if [ "$GET_BRANCH" == "origin/master" ]; then if [ "$GET_BRANCH" == "origin/master" ]; then