From 194e4db8de39d6a687c321506c204050aa1d5d95 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Sat, 2 Feb 2019 22:54:31 +0100 Subject: [PATCH 1/2] Update makerelease --- makerelease | 5 +++++ 1 file changed, 5 insertions(+) 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 From a31ec365dd6a05fe197f081ec5f01df399ee1db5 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Sat, 2 Feb 2019 22:55:04 +0100 Subject: [PATCH 2/2] New Release : 2019.02.02.22.54.56 --- archfi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archfi b/archfi index 3808392..f2c665d 100644 --- a/archfi +++ b/archfi @@ -12,7 +12,7 @@ # referance : https://wiki.archlinux.org/index.php/Installation_guide -apptitle="Arch Linux Fast Install (archfi) - Version: 2019.01.10.23.04.13 (GPLv3)" +apptitle="Arch Linux Fast Install (archfi) - Version: 2019.02.02.22.54.56 (GPLv3)" baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master skipfont="0"