Правки push-update - расстановка фигурных скобок в удобочитаемом и корректном виде

This commit is contained in:
Alexander Demidov
2014-01-13 17:34:53 +04:00
parent 99a1eb5adf
commit 2d54b467e4

View File

@ -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}'` 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" && git tag "$VERSION" &&
gitchangelog > CHANGELOG.md && gitchangelog > CHANGELOG.md &&
{ git add CHANGELOG.md > /dev/null && {
git commit -m "Update CHANGELOG.md" > /dev/null && git add CHANGELOG.md >/dev/null &&
git tag -d "$VERSION" && git commit -m "Update CHANGELOG.md" > /dev/null &&
git tag "$VERSION" && git tag -d "$VERSION" >/dev/null &&
git push --tags >/dev/null 2>/dev/null; } || git tag "$VERSION" >/dev/null &&
{ echo -e "Cannot push released tag into remote repository\n" && git push --tags >/dev/null 2>/dev/null
exit 1; } } || {
echo -e "Cannot push released tag into remote repository\n"
exit 1
}
else else
VERSION=$VERSION_PREVIOUS VERSION=$VERSION_PREVIOUS
fi fi
git push > /dev/null || exit 1 git push >/dev/null || exit 1
MESSAGE="\nUpdate ${PATH_LIB} on ${VERSION}\n" MESSAGE="\nUpdate ${PATH_LIB} on ${VERSION}\n"
CURRENT_DIR=`pwd` CURRENT_DIR=`pwd`
for project in "${PROJECTS[@]}" for project in "${PROJECTS[@]}"
do do
echo -e "Update lib for ${project}...\n" echo -e "Update lib for ${project}...\n"
{cd "${project}${PATH_LIB}" && {
git fetch >/dev/null 2>/dev/null && cd "${project}${PATH_LIB}" &&
git checkout $VERSION 2>/dev/null; } || git fetch >/dev/null 2>/dev/null &&
{ echo -e "Failed to checkout lib on tag ${VERSION}\n" && git checkout "$VERSION" 2>/dev/null;
exit 1; } } || {
echo -e "Failed to checkout lib on tag ${VERSION}\n" &&
exit 1;
}
cd "${project}" cd "${project}"
LIB_DIR=`echo ${PATH_LIB#'/'}` LIB_DIR=`echo ${PATH_LIB#'/'}`
git diff-index --quiet HEAD "$LIB_DIR" git diff-index --quiet HEAD "$LIB_DIR"
LIB_NEW_COMMITS=`echo $?` LIB_NEW_COMMITS=`echo $?`
if [ $LIB_NEW_COMMITS == 1 ] if [ $LIB_NEW_COMMITS == 1 ]
then then
{ git reset > /dev/null && {
git add "$LIB_DIR" > /dev/null && git reset >/dev/null &&
git commit -m "$MESSAGE" > /dev/null; } || git add "$LIB_DIR" >/dev/null &&
{ echo -e "Failed to update lib for ${project}\n" && git commit -m "$MESSAGE" >/dev/null
exit 1; } } || {
echo -e "Failed to update lib for ${project}\n"
exit 1
}
if [ $project == "/var/www/d753_common" ] if [ $project == "/var/www/d753_common" ]
then then
{ git push origin master > /dev/null && {
cd /var/www/d753/ && ./merge-from-master.sh > /dev/null git push origin master > /dev/null &&
cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null; } || cd /var/www/d753/ && ./merge-from-master.sh > /dev/null
{ echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n" && cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null
exit 1; } } || {
echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n"
exit 1
}
fi fi
else else
echo -e "Already update\n" echo -e "Already update\n"