From c1047c1ea1a6c8008159836182eb65a52f7a1fd3 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 23 Dec 2014 16:18:51 +0300
Subject: Fix style in shell scripts.

---
 pull.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'pull.sh')

diff --git a/pull.sh b/pull.sh
index 6e490c0..68c1f93 100755
--- a/pull.sh
+++ b/pull.sh
@@ -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"
-- 
cgit v1.2.3-60-g2f50