diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-12-23 16:18:51 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-12-23 16:18:51 +0300 |
commit | c1047c1ea1a6c8008159836182eb65a52f7a1fd3 (patch) | |
tree | b3572c681591111f1ad6fec85cf9256d115acffc /pull.sh | |
parent | d91e921c0bc72b23d17a3581a420295ffc856b4c (diff) | |
download | all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.tar.gz all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.tar.bz2 all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.tar.xz all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.zip |
Fix style in shell scripts.
Diffstat (limited to 'pull.sh')
-rwxr-xr-x | pull.sh | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -4,44 +4,44 @@ function status { if [ ! -d "$1" ]; then return fi - DIR=`pwd` + DIR=$(pwd) cd "$1" echo "$2:" if [[ "${CMD}" == "force" ]]; then git pull --commit --no-edit - cd $DIR + cd "$DIR" return fi - STR=`git diff --name-only` - STR2=`git status|grep "Your branch is ahead"` - STR3=`git status -s -uno` + STR=$(git diff --name-only) + STR2=$(git status|grep "Your branch is ahead") + STR3=$(git status -s -uno) if [[ -n "${STR}${STR2}${STR3}" ]]; then echo -e "\e[1;31mCant pull because changes not pushed\e[0m" else git pull fi - cd $DIR + cd "$DIR" } function status2 { if [ ! -d "$1" ]; then return fi - DIR=`pwd` + DIR=$(pwd) cd "$1" - STR=`git diff --name-only` - STR2=`git status|grep "Your branch is ahead"` - STR3=`git status -s -uno` + STR=$(git diff --name-only) + STR2=$(git status|grep "Your branch is ahead") + STR3=$(git status -s -uno) echo "$2:" if [[ -n "${STR}${STR2}${STR3}" ]]; then echo -e "\e[1;31mCant pull because changes not pushed\e[0m" else git pull --no-commit git fetch origin - export BRANCH=`git rev-parse --abbrev-ref HEAD` - git reset --hard origin/${BRANCH} + export BRANCH=$(git rev-parse --abbrev-ref HEAD) + git reset --hard "origin/${BRANCH}" fi - cd $DIR + cd "$DIR" } CMD="$1" |