aboutsummaryrefslogtreecommitdiffstats
path: root/makerelease
diff options
context:
space:
mode:
authorMatMoul <matmoul@gmail.com>2019-02-02 22:56:19 +0100
committerMatMoul <matmoul@gmail.com>2019-02-02 22:56:19 +0100
commita87e3aacb65706090a73f1a530ac981e73b3f503 (patch)
tree0d85d5c7e7a2fd0f3b46a8f709a8461a894b8d41 /makerelease
parent78ce60a75a414ab234c5f066de4470332022687b (diff)
parenta31ec365dd6a05fe197f081ec5f01df399ee1db5 (diff)
downloadhyperfi-a87e3aacb65706090a73f1a530ac981e73b3f503.tar.lz
hyperfi-a87e3aacb65706090a73f1a530ac981e73b3f503.tar.xz
hyperfi-a87e3aacb65706090a73f1a530ac981e73b3f503.zip
Update makerelease
Diffstat (limited to 'makerelease')
-rwxr-xr-xmakerelease4
1 files changed, 4 insertions, 0 deletions
diff --git a/makerelease b/makerelease
index c4a9651..7ae0976 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
@@ -73,6 +74,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 +106,6 @@ rm -R .build
if [ ! "$branch" = "master" ]; then
git checkout $branch
+ git pull
+ git push
fi