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

fix remote version checks

Browse Source
This commit is contained in:
th33xitus
2020-07-20 10:09:42 +02:00
parent 8ffdf12a4a
commit 4cb2ba51bd
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/status.sh
View File

@@ -104,7 +104,7 @@ read_branch(){
#if reading the branch gives an empty string #if reading the branch gives an empty string
#we are on non-detached HEAD state on origin/master #we are on non-detached HEAD state on origin/master
#and need to set GET_BRANCH to make a non-empty string #and need to set GET_BRANCH to make a non-empty string
if [ -z $GET_BRANCH ]; then if [ -z "$GET_BRANCH" ]; then
GET_BRANCH="origin/master" GET_BRANCH="origin/master"
fi fi
else else
@@ -140,7 +140,12 @@ read_local_klipper_commit(){
read_remote_klipper_commit(){ read_remote_klipper_commit(){
read_branch read_branch
if [ ! -z $GET_BRANCH ];then if [ ! -z "$GET_BRANCH" ];then
if [ "$GET_BRANCH" == "origin/master" ]; then
git fetch origin master -q
else
git fetch $GET_BRANCH -q
fi
REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH) REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH)
else else
REMOTE_COMMIT="" REMOTE_COMMIT=""
@@ -164,6 +169,7 @@ compare_klipper_versions(){
read_dwc2fk_versions(){ read_dwc2fk_versions(){
if [ -d $DWC2FK_DIR ] && [ -d $DWC2FK_DIR/.git ]; then if [ -d $DWC2FK_DIR ] && [ -d $DWC2FK_DIR/.git ]; then
cd $DWC2FK_DIR cd $DWC2FK_DIR
git fetch origin master -q
LOCAL_DWC2FK_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_DWC2FK_COMMIT=$(git rev-parse --short=8 HEAD)
REMOTE_DWC2FK_COMMIT=$(git rev-parse --short=8 origin/master) REMOTE_DWC2FK_COMMIT=$(git rev-parse --short=8 origin/master)
else else