ouroboros-gorup/obos-fi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update makerelease

Browse source
This commit is contained in:
MatMoul 2019-02-02 22:56:19 +01:00
commit a87e3aacb6
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archfi
View file

@ -12,7 +12,11 @@
# referance : https://wiki.archlinux.org/index.php/Installation_guide # 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.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 baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
skipfont="0" skipfont="0"

4
makerelease
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
@ -73,6 +74,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 +106,6 @@ rm -R .build
if [ ! "$branch" = "master" ]; then if [ ! "$branch" = "master" ]; then
git checkout $branch git checkout $branch
git pull
git push
fi fi