From a5497b5cd963ab627ede71b3b26e21505e5266f5 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Tue, 2 Jun 2020 11:32:38 -0500 Subject: [PATCH] Better way to show dev branch --- gravity-sync.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gravity-sync.sh b/gravity-sync.sh index 34f473f..19077f9 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -106,10 +106,14 @@ function update_gs { if [ -f "$HOME/${LOCAL_FOLDR}/dev" ] then BRANCH='development' - B_SHORT='DEV' else BRANCH='master' - B_SHORT='' + fi + + if [ "$BRANCH" = "development" ] + then + MESSAGE="Pulling from origin/development" + echo_info fi GIT_CHECK=$(git status | awk '{print $1}') @@ -125,7 +129,7 @@ function update_gs { echo_stat git fetch --all >/dev/null 2>&1 error_validate - MESSAGE="Applying Update ${B_SHORT}" + MESSAGE="Applying Update" echo_stat git reset --hard origin/${BRANCH} >/dev/null 2>&1 error_validate