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

fix read branch error

Browse Source
This commit is contained in:
th33xitus
2020-08-05 00:09:18 +02:00
parent be6a63f95b
commit 2e4da7f220
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/status.sh
View File

@@ -143,6 +143,8 @@ print_branch(){
read_branch read_branch
if [ "$GET_BRANCH" == "origin/master" ]; then if [ "$GET_BRANCH" == "origin/master" ]; then
PRINT_BRANCH="$GET_BRANCH " PRINT_BRANCH="$GET_BRANCH "
elif [ "$GET_BRANCH" == "master" ]; then
PRINT_BRANCH="origin/master "
elif [ "$GET_BRANCH" == "dmbutyugin/scurve-shaping" ]; then elif [ "$GET_BRANCH" == "dmbutyugin/scurve-shaping" ]; then
PRINT_BRANCH="scurve-shaping " PRINT_BRANCH="scurve-shaping "
elif [ "$GET_BRANCH" == "dmbutyugin/scurve-smoothing" ]; then elif [ "$GET_BRANCH" == "dmbutyugin/scurve-smoothing" ]; then
@@ -166,7 +168,7 @@ 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 if [[ "$GET_BRANCH" == "origin/master" || "master" ]]; then
git fetch origin master -q git fetch origin master -q
else else
git fetch $(echo "$GET_BRANCH" | cut -d"/" -f1) -q git fetch $(echo "$GET_BRANCH" | cut -d"/" -f1) -q