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

fix: different way of displaying versions

Browse Source
This commit is contained in:
domi
2020-11-28 23:15:29 +01:00
parent acf8a817d8
commit e6dde2cf23
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/status.sh
View File

@@ -219,7 +219,7 @@ print_branch(){
read_local_klipper_commit(){ read_local_klipper_commit(){
if [ -d $KLIPPER_DIR ] && [ -d $KLIPPER_DIR/.git ]; then if [ -d $KLIPPER_DIR ] && [ -d $KLIPPER_DIR/.git ]; then
cd $KLIPPER_DIR cd $KLIPPER_DIR
LOCAL_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
else else
LOCAL_COMMIT=$NONE LOCAL_COMMIT=$NONE
fi fi
@@ -230,10 +230,10 @@ read_remote_klipper_commit(){
if [ ! -z "$GET_BRANCH" ];then if [ ! -z "$GET_BRANCH" ];then
if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "master" ]; then if [ "$GET_BRANCH" = "origin/master" ] || [ "$GET_BRANCH" = "master" ]; then
git fetch origin -q git fetch origin -q
REMOTE_COMMIT=$(git rev-parse --short=8 origin) REMOTE_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
else else
git fetch $(echo "$GET_BRANCH" | cut -d"/" -f1) -q git fetch $(echo "$GET_BRANCH" | cut -d"/" -f1) -q
REMOTE_COMMIT=$(git rev-parse --short=8 $GET_BRANCH) REMOTE_COMMIT=$(git describe $GET_BRANCH --always --tags | cut -d "-" -f 1,2)
fi fi
else else
REMOTE_COMMIT=$NONE REMOTE_COMMIT=$NONE
@@ -262,8 +262,8 @@ 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 git fetch origin master -q
LOCAL_DWC2FK_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_DWC2FK_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
REMOTE_DWC2FK_COMMIT=$(git rev-parse --short=8 origin/master) REMOTE_DWC2FK_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
else else
LOCAL_DWC2FK_COMMIT=$NONE LOCAL_DWC2FK_COMMIT=$NONE
REMOTE_DWC2FK_COMMIT=$NONE REMOTE_DWC2FK_COMMIT=$NONE
@@ -331,8 +331,8 @@ read_moonraker_versions(){
if [ -d $MOONRAKER_DIR ] && [ -d $MOONRAKER_DIR/.git ]; then if [ -d $MOONRAKER_DIR ] && [ -d $MOONRAKER_DIR/.git ]; then
cd $MOONRAKER_DIR cd $MOONRAKER_DIR
git fetch origin master -q git fetch origin master -q
LOCAL_MOONRAKER_COMMIT=$(git rev-parse --short=8 HEAD) LOCAL_MOONRAKER_COMMIT=$(git describe HEAD --always --tags | cut -d "-" -f 1,2)
REMOTE_MOONRAKER_COMMIT=$(git rev-parse --short=8 origin/master) REMOTE_MOONRAKER_COMMIT=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
else else
LOCAL_MOONRAKER_COMMIT=$NONE LOCAL_MOONRAKER_COMMIT=$NONE
REMOTE_MOONRAKER_COMMIT=$NONE REMOTE_MOONRAKER_COMMIT=$NONE