aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatMoul <matmoul@gmail.com>2019-02-02 22:54:31 +0100
committerMatMoul <matmoul@gmail.com>2019-02-02 22:54:31 +0100
commit194e4db8de39d6a687c321506c204050aa1d5d95 (patch)
treeabcd7109ea669886dc6d55611fe682b06231e5ce
parent5f0023b6b4ae8f8c24b80db804e3455a6f6818e1 (diff)
downloadhyperfi-194e4db8de39d6a687c321506c204050aa1d5d95.tar.lz
hyperfi-194e4db8de39d6a687c321506c204050aa1d5d95.tar.xz
hyperfi-194e4db8de39d6a687c321506c204050aa1d5d95.zip
Update makerelease
-rwxr-xr-xmakerelease5
1 files changed, 5 insertions, 0 deletions
diff --git a/makerelease b/makerelease
index c4a9651..2e3baae 100755
--- a/makerelease
+++ b/makerelease
@@ -45,6 +45,7 @@ git commit -a -m "New Release : $version"
if [ ! "$branch" = "master" ]; then
echo "Merge branch $branch to master..."
git checkout master
+ git pull
git merge $branch
read -p "Delete branch $branch ? (y/N)" choice
@@ -61,6 +62,7 @@ case "$choice" in
esac
git checkout master
+git pull
echo "Push release..."
git push
@@ -73,6 +75,7 @@ esac
echo "Create index.html..."
fle=$(cat archfi)
git checkout gh-pages
+git pull
echo "$fle" > index.html
chmod 640 index.html
git commit -a -m "New Release : $version"
@@ -104,4 +107,6 @@ rm -R .build
if [ ! "$branch" = "master" ]; then
git checkout $branch
+ git pull
+ git push
fi