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 | |
parent | d91e921c0bc72b23d17a3581a420295ffc856b4c (diff) | |
download | all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.tar.gz all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.tar.bz2 all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.tar.xz all-c1047c1ea1a6c8008159836182eb65a52f7a1fd3.zip |
Fix style in shell scripts.
-rwxr-xr-x | git.sh | 6 | ||||
-rwxr-xr-x | init.sh | 2 | ||||
-rwxr-xr-x | pull.sh | 26 | ||||
-rwxr-xr-x | push.sh | 6 | ||||
-rwxr-xr-x | status.sh | 12 |
5 files changed, 26 insertions, 26 deletions
@@ -4,11 +4,11 @@ function status { if [ ! -d "$1" ]; then return fi - DIR=`pwd` + DIR=$(pwd) cd "$1" echo "$2:" - git $CMD - cd $DIR + git "$CMD" + cd "$DIR" } CMD="$*" @@ -6,7 +6,7 @@ if [[ -z "${CMD}" ]]; then export CMD="default" fi -STR=`git remote -v|grep "https://"` +STR=$(git remote -v|grep "https://") if [[ -n "${STR}" ]]; then export PROTO="https://gitorious.org/" fi @@ -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" @@ -4,14 +4,14 @@ function status { if [ ! -d "$1" ]; then return fi - DIR=`pwd` + DIR=$(pwd) cd "$1" - STR=`git status|grep "Your branch is ahead"` + STR=$(git status|grep "Your branch is ahead") if [[ -n "${STR}" ]]; then echo "pusing $2" git push fi - cd $DIR + cd "$DIR" } status . evol-all @@ -4,13 +4,13 @@ function status { if [ ! -d "$1" ]; then return fi - DIR=`pwd` + DIR=$(pwd) cd "$1" - STR=`git diff --stat --color=always` - STR2=`git status|grep -E "Your branch is (behind|ahead)"` - STR3=`git status -s -uno` + STR=$(git diff --stat --color=always) + STR2=$(git status|grep -E "Your branch is (behind|ahead)") + STR3=$(git status -s -uno) if [[ "${CMD}" == "commit" || "${CMD}" == "c" ]]; then - COMMIT=`git rev-parse HEAD` + COMMIT=$(git rev-parse HEAD) echo -e "$2: \e[1;33m${COMMIT}\e[0m" fi if [[ -n "${STR}${STR2}${STR3}" ]]; then @@ -26,7 +26,7 @@ function status { echo -e "\e[1;33m${STR3}\e[0m" fi fi - cd $DIR + cd "$DIR" } CMD="$1" |