From 2d54b467e484929d1787c2a1bb2e8d95bdc5b213 Mon Sep 17 00:00:00 2001
From: Alexander Demidov <dimti@bk.ru>
Date: Mon, 13 Jan 2014 17:34:53 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20push-upd?=
 =?UTF-8?q?ate=20=20-=20=D1=80=D0=B0=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D1=81=D0=BA=D0=BE=D0=B1=D0=BE=D0=BA=20=D0=B2=20=D1=83?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=BE=D1=87=D0=B8=D1=82=D0=B0=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=BE=D0=BC=20=D0=B8=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=BD=D0=BE=D0=BC=20=D0=B2=D0=B8=D0=B4=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 push-update.sh | 58 +++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/push-update.sh b/push-update.sh
index 9bfa052..8a26db0 100755
--- a/push-update.sh
+++ b/push-update.sh
@@ -26,46 +26,58 @@ then
     VERSION=`echo ${VERSION_PREVIOUS} | awk -F. -v OFS=. 'NF==1{print ++$NF}; NF>1{if(length($NF+1)>length($NF))$(NF-1)++; $NF=sprintf("%0*d", length($NF), ($NF+1)%(10^length($NF))); print}'`
     git tag "$VERSION" &&
     gitchangelog > CHANGELOG.md &&
-    { git add CHANGELOG.md > /dev/null &&
-    git commit -m "Update CHANGELOG.md" > /dev/null &&
-    git tag -d "$VERSION" &&
-    git tag "$VERSION" &&
-    git push --tags >/dev/null 2>/dev/null; } ||
-    { echo -e "Cannot push released tag into remote repository\n" &&
-    exit 1; }
+    {
+        git add CHANGELOG.md >/dev/null &&
+        git commit -m "Update CHANGELOG.md" > /dev/null &&
+        git tag -d "$VERSION" >/dev/null &&
+        git tag "$VERSION" >/dev/null &&
+        git push --tags >/dev/null 2>/dev/null
+    } || {
+        echo -e "Cannot push released tag into remote repository\n"
+        exit 1
+    }
 else
     VERSION=$VERSION_PREVIOUS
 fi
-git push > /dev/null || exit 1
+git push >/dev/null || exit 1
 
 MESSAGE="\nUpdate ${PATH_LIB} on ${VERSION}\n"
 CURRENT_DIR=`pwd`
 for project in "${PROJECTS[@]}"
 do
 	echo -e "Update lib for ${project}...\n"
-	{cd "${project}${PATH_LIB}" &&
-	git fetch >/dev/null 2>/dev/null &&
-	git checkout $VERSION 2>/dev/null; } ||
-	{ echo -e "Failed to checkout lib on tag ${VERSION}\n" &&
-	exit 1; }
+	{
+        cd "${project}${PATH_LIB}" &&
+        git fetch >/dev/null 2>/dev/null &&
+        git checkout "$VERSION" 2>/dev/null;
+	} || {
+	    echo -e "Failed to checkout lib on tag ${VERSION}\n" &&
+	    exit 1;
+    }
 	cd "${project}"
 	LIB_DIR=`echo ${PATH_LIB#'/'}`
 	git diff-index --quiet HEAD "$LIB_DIR"
 	LIB_NEW_COMMITS=`echo $?`
 	if [ $LIB_NEW_COMMITS == 1 ]
 	then
-	    { git reset > /dev/null &&
-        git add "$LIB_DIR" > /dev/null &&
-        git commit -m "$MESSAGE" > /dev/null; } ||
-        { echo -e "Failed to update lib for ${project}\n" &&
-        exit 1; }
+	    {
+	        git reset >/dev/null &&
+            git add "$LIB_DIR" >/dev/null &&
+            git commit -m "$MESSAGE" >/dev/null
+        } || {
+            echo -e "Failed to update lib for ${project}\n"
+            exit 1
+        }
         if [ $project == "/var/www/d753_common" ]
         then
-            { git push origin master > /dev/null &&
-            cd /var/www/d753/ && ./merge-from-master.sh > /dev/null
-            cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null; } ||
-            { echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n" &&
-            exit 1; }
+            {
+                git push origin master > /dev/null &&
+                cd /var/www/d753/ && ./merge-from-master.sh > /dev/null
+                cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null
+            } || {
+                echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n"
+                exit 1
+            }
         fi
     else
         echo -e "Already update\n"