Правки push-update 06
This commit is contained in:
@ -40,11 +40,11 @@ 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 "\nUpdate lib for ${project}...\n"
|
echo -e "Update lib for ${project}...\n"
|
||||||
(cd "${project}${PATH_LIB}" &&
|
(cd "${project}${PATH_LIB}" &&
|
||||||
git fetch > /dev/null &&
|
git fetch >/dev/null 2>/dev/null &&
|
||||||
git checkout $VERSION 2> /dev/null) ||
|
git checkout $VERSION 2>/dev/null) ||
|
||||||
(echo -e "\nFailed to checkout lib on tag ${VERSION}\n" &&
|
(echo -e "Failed to checkout lib on tag ${VERSION}\n" &&
|
||||||
exit 1)
|
exit 1)
|
||||||
cd "${project}"
|
cd "${project}"
|
||||||
git diff-index --quiet HEAD "`echo ${PATH_LIB#'/'}`"
|
git diff-index --quiet HEAD "`echo ${PATH_LIB#'/'}`"
|
||||||
@ -54,20 +54,20 @@ do
|
|||||||
(git reset > /dev/null &&
|
(git reset > /dev/null &&
|
||||||
git add "`echo ${PATH_LIB#'/'}`" > /dev/null &&
|
git add "`echo ${PATH_LIB#'/'}`" > /dev/null &&
|
||||||
git commit -m $MESSAGE > /dev/null) ||
|
git commit -m $MESSAGE > /dev/null) ||
|
||||||
(echo -e "\nFailed to update lib for ${project}\n" &&
|
(echo -e "Failed to update lib for ${project}\n" &&
|
||||||
exit 1)
|
exit 1)
|
||||||
if [ $project == "/var/www/d753_common" ]
|
if [ $project == "/var/www/d753_common" ]
|
||||||
then
|
then
|
||||||
(git push origin master > /dev/null &&
|
(git push origin master > /dev/null &&
|
||||||
cd /var/www/d753/ && ./merge-from-master.sh > /dev/null
|
cd /var/www/d753/ && ./merge-from-master.sh > /dev/null
|
||||||
cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null) ||
|
cd /var/www/d753_10ballov/ && ./merge-from-master.sh > /dev/null) ||
|
||||||
(echo -e "\nFailed to update dependency d753 branches... Please resolve that problem by hand\n" &&
|
(echo -e "Failed to update dependency d753 branches... Please resolve that problem by hand\n" &&
|
||||||
exit 1)
|
exit 1)
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo -e "\nAlready update\n"
|
echo -e "Already update\n"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
echo -e "\nAll operations succeed\n"
|
echo -e "All operations succeed\n"
|
||||||
exit 0
|
exit 0
|
Reference in New Issue
Block a user