Cutlery/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2025-11-03 17:17:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Better way to show dev branch

Browse Source
This commit is contained in:
Michael Stanclift 2020-06-02 11:32:38 -05:00
parent 6e86e4dc4d
commit a5497b5cd9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gravity-sync.sh
View File

@ -106,10 +106,14 @@ function update_gs {
if [ -f "$HOME/${LOCAL_FOLDR}/dev" ] if [ -f "$HOME/${LOCAL_FOLDR}/dev" ]
then then
BRANCH='development' BRANCH='development'
B_SHORT='DEV'
else else
BRANCH='master' BRANCH='master'
B_SHORT='' fi
if [ "$BRANCH" = "development" ]
then
MESSAGE="Pulling from origin/development"
echo_info
fi fi
GIT_CHECK=$(git status | awk '{print $1}') GIT_CHECK=$(git status | awk '{print $1}')
@ -125,7 +129,7 @@ function update_gs {
echo_stat echo_stat
git fetch --all >/dev/null 2>&1 git fetch --all >/dev/null 2>&1
error_validate error_validate
MESSAGE="Applying Update ${B_SHORT}" MESSAGE="Applying Update"
echo_stat echo_stat
git reset --hard origin/${BRANCH} >/dev/null 2>&1 git reset --hard origin/${BRANCH} >/dev/null 2>&1
error_validate error_validate