Update makerelease

This commit is contained in:
MatMoul 2019-02-02 22:54:31 +01:00
parent 5f0023b6b4
commit 194e4db8de

View file

@ -45,6 +45,7 @@ git commit -a -m "New Release : $version"
if [ ! "$branch" = "master" ]; then if [ ! "$branch" = "master" ]; then
echo "Merge branch $branch to master..." echo "Merge branch $branch to master..."
git checkout master git checkout master
git pull
git merge $branch git merge $branch
read -p "Delete branch $branch ? (y/N)" choice read -p "Delete branch $branch ? (y/N)" choice
@ -61,6 +62,7 @@ case "$choice" in
esac esac
git checkout master git checkout master
git pull
echo "Push release..." echo "Push release..."
git push git push
@ -73,6 +75,7 @@ esac
echo "Create index.html..." echo "Create index.html..."
fle=$(cat archfi) fle=$(cat archfi)
git checkout gh-pages git checkout gh-pages
git pull
echo "$fle" > index.html echo "$fle" > index.html
chmod 640 index.html chmod 640 index.html
git commit -a -m "New Release : $version" git commit -a -m "New Release : $version"
@ -104,4 +107,6 @@ rm -R .build
if [ ! "$branch" = "master" ]; then if [ ! "$branch" = "master" ]; then
git checkout $branch git checkout $branch
git pull
git push
fi fi