diff options
| -rw-r--r-- | archfi | 4 | ||||
| -rwxr-xr-x | makerelease | 4 |
2 files changed, 8 insertions, 0 deletions
@@ -12,7 +12,11 @@ # referance : https://wiki.archlinux.org/index.php/Installation_guide +<<<<<<< HEAD apptitle="Arch Linux Fast Install (archfi) - Version: 2019.01.10.23.16.00 (GPLv3)" +======= +apptitle="Arch Linux Fast Install (archfi) - Version: 2019.02.02.22.54.56 (GPLv3)" +>>>>>>> src baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master skipfont="0" 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 |