ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts: replaced echo with echo -e for color in linux (maybe windows)

Browse Source
This commit is contained in:
Andreas Stallinger
2014-03-31 20:42:53 +02:00
parent 055b3d0029
commit f61425b4e8
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/git-publish.sh
+14 -14
View File
@@ -4,43 +4,43 @@ ABORT="\033[31mAbort:\033[00m"
SUCCESS="\033[32mSuccess:\033[00m"
INFO="\033[33mInfo:\033[00m"
echo $INFO "Checking index"
echo -e $INFO "Checking index"
# check clean index
if [[ -n $(git diff HEAD) ]]
then
echo $ABORT "You have uncommited changes."
echo -e $ABORT "You have uncommited changes."
exit 1
fi
BRANCH_NAME=$(git symbolic-ref -q --short HEAD)
PUBLISH_BRANCH_NAME=_publish_"$BRANCH_NAME"_
echo $INFO "Checking branch $BRANCH_NAME"
echo -e $INFO "Checking branch $BRANCH_NAME"
# check if on branch
if [ -z $BRANCH_NAME ]
then
echo $ABORT "You are not on any branch."
echo -e $ABORT "You are not on any branch."
exit 1
fi
# check if on master
if [ $BRANCH_NAME == "master" ]
then
echo $ABORT "You are on master. Use this script only from a feature branch."
echo -e $ABORT "You are on master. Use this script only from a feature branch."
exit 1
fi
git checkout -q master
git remote update &>/dev/null
echo $INFO "Checking master"
echo -e $INFO "Checking master"
# check if master is up to date
if [[ -n $(git diff origin/master) ]]
then
echo $ABORT "Your master is not up-to-date. Run 'sync.sh' to update your master, then run 'git rebase master' to update branch $BRANCH_NAME."
echo -e $ABORT "Your master is not up-to-date. Run 'sync.sh' to update your master, then run 'git rebase master' to update branch $BRANCH_NAME."
git checkout -q $BRANCH_NAME
exit 1
fi
@@ -55,21 +55,21 @@ BRANCH_HEAD_COMMIT=$(git rev-parse HEAD)
# check if feature has commits
if [ $BRANCH_HEAD_COMMIT == $MASTER_HEAD_COMMIT ]
then
echo $ABORT "Your feature branch has no commits."
echo -e $ABORT "Your feature branch has no commits."
exit 1
fi
# check if feature is not behind master
if [ $BASE_COMMIT != $MASTER_HEAD_COMMIT ]
then
echo $ABORT "Your feature branch is behind master. Use 'git rebase master' to update your feature branch."
echo -e $ABORT "Your feature branch is behind master. Use 'git rebase master' to update your feature branch."
exit 1
fi
# switch to temporary branch for squashing
git checkout -q -b $PUBLISH_BRANCH_NAME
echo $INFO "Squashing commits"
echo -e $INFO "Squashing commits"
git reset --soft $BASE_COMMIT
git commit
@@ -80,21 +80,21 @@ then
exit 1
fi
echo $INFO "Rebasing on master"
echo -e $INFO "Rebasing on master"
git checkout -q master
git rebase -q $PUBLISH_BRANCH_NAME
git branch -q -d $PUBLISH_BRANCH_NAME
echo $INFO "Uploading to origin master"
echo -e $INFO "Uploading to origin master"
git push origin master
if [ $? != 0 ]
then
git reset --hard -q HEAD^
git checkout -q $BRANCH_NAME
echo $ABORT "Pushing to origin master has failed, there are new remote changes. Run 'sync.sh' to update your master, then run 'git rebase master' to update branch $BRANCH_NAME."
echo -e $ABORT "Pushing to origin master has failed, there are new remote changes. Run 'sync.sh' to update your master, then run 'git rebase master' to update branch $BRANCH_NAME."
exit 1
fi
echo $SUCCESS "Published branch $BRANCH_NAME successfully"
echo -e $SUCCESS "Published branch $BRANCH_NAME successfully"
exit 0