diff --git a/CHANGELOG b/CHANGELOG index 5c8ce7a..06192a0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,16 @@ Current Version : ----------------- +Builder : +- Updated build process. + +Archdi : +- Add menu to select source server. + + +Version : 2015.08.20.19.55.41 : +------------------------------- + Licence : - GPL-3.0 -> LGPL-3.0. @@ -12,8 +22,7 @@ Version : 2015.07.19.04.55.32 : ------------------------------- Archdi : -- Update URL to github, - +- Update URL to github. Version : 2015.06.28.20.37.40 : diff --git a/archfi b/archfi index 1ee8ad4..87ac9a7 100644 --- a/archfi +++ b/archfi @@ -2,18 +2,20 @@ # Arch Linux Fast Install (archfi) # -------------------------------- -# author : https://github.com/MatMoul +# author : MatMoul +# https://github.com/MatMoul +# http://sourceforge.net/u/matmoul # project : https://github.com/MatMoul/archfi +# http://sourceforge.net/projects/archfi/ # license : LGPL-3.0 (http://opensource.org/licenses/lgpl-3.0.html) # # referance : https://wiki.archlinux.org/index.php/Installation_guide -apptitle="Arch Linux Fast Install (archfi) - Version: 2015.07.19.04.55.32 (GPLv3)" +apptitle="Arch Linux Fast Install (archfi) - Version: 2015.08.20.19.55.41 (GPLv3)" baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master - # -------------------------------------------------------- mainmenu(){ if [ "$1" = "" ]; then @@ -985,10 +987,30 @@ installarchdi(){ fi fi } +archdidownload(){ + options=() + options+=("sourceforge.net" "recommended") + options+=("github.com" "") + sel=$(whiptail --backtitle "$apptitle" --title "$txtselectserver" --menu "" --cancel-button "Back" 0 0 0 \ + "${options[@]}" \ + 3>&1 1>&2 2>&3) + if [ "$?" = "0" ]; then + case $sel in + "sourceforge.net") + archdiurl=archdi.sourceforge.net/archdi + ;; + "github.com") + archdiurl=matmoul.github.io/archdi >archdi + ;; + esac + fi + curl -L $archdiurl >archdi +} archdiinstallandlaunchchroot(){ cd #curl -L archdi.sourceforge.net/archdi >archdi - curl -L matmoul.github.io/archdi >archdi + #curl -L matmoul.github.io/archdi >archdi >archdi + archdidownload sh archdi -i archdi --chroot exit @@ -996,7 +1018,8 @@ archdiinstallandlaunchchroot(){ archdilaunchchroot(){ cd #curl -L archdi.sourceforge.net/archdi >archdi - curl -L matmoul.github.io/archdi >archdi + #curl -L matmoul.github.io/archdi >archdi >archdi + archdidownload sh archdi --chroot rm archdi exit @@ -1004,7 +1027,8 @@ archdilaunchchroot(){ archdiinstallchroot(){ cd #curl -L archdi.sourceforge.net/archdi >archdi - curl -L matmoul.github.io/archdi >archdi + #curl -L matmoul.github.io/archdi >archdi >archdi + archdidownload sh archdi -i exit } @@ -1018,6 +1042,8 @@ pressanykey(){ } loadstrings(){ + txtselectserver="Select source server :" + txtmainmenu="Main Menu" txtlanguage="Language" txtsetkeymap="Set Keyboard Layout" diff --git a/lng/French b/lng/French index 2350010..3bb87e6 100644 --- a/lng/French +++ b/lng/French @@ -6,6 +6,8 @@ # notes : misc text... +txtselectserver="Sélectionnez le serveur source :" + txtmainmenu="Menu Principal" txtlanguage="Language" txtsetkeymap="Disposition clavier" diff --git a/makerelease b/makerelease new file mode 100644 index 0000000..576d1cf --- /dev/null +++ b/makerelease @@ -0,0 +1,61 @@ +#!/bin/bash + +prjname=archfi +version=$(date +"%Y.%m.%d.%H.%M.%S") +branch=$(git rev-parse --abbrev-ref HEAD) + +clear +read -p "Current branch is $branch. Continue ? (y/N)" choice +case "$choice" in + n|N|'' ) + echo "cancel build !" + exit 1 + ;; + y|Y ) echo "Begin Build Release...";; + * ) + echo "cancel build !" + exit 1 + ;; +esac +echo "Building version $version..." +echo "" + +echo "Finalise archfi script..." +sed -i /apptitle=/c\apptitle=\""Arch Linux Fast Install (archfi) - Version: $version (GPLv3)"\" archfi +sed -i /baseurl=/c\baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master archfi + +echo "Finalise CHANGELOG..." +sed -i '/Current\ Version\ :/{n;d}' CHANGELOG +sed -i '/Current\ Version\ :/a-------------------------------' CHANGELOG +sed -i "/Current\ Version\ :/c\Version\ :\ $version\ :" CHANGELOG +sed -i '1s/^/\n/' CHANGELOG +sed -i '1s/^/-----------------\n/' CHANGELOG +sed -i '1s/^/Current Version :\n/' CHANGELOG + +echo "Make last commit..." +git commit -m "New Release : $version" * + +echo "Merge branch $branch to master..." +git checkout master +git merge $branch +#git push + + + +#Sourceforge : + +#archfi +#baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master + +# Make redirect Page +#pubfile=resources/sourceforge.net/pub/$prjname/index.php +#echo " $pubfile +#echo "header(\"Location: http://downloads.sourceforge.net/project/$prjname/release/$version/$prjname\");" >> $pubfile +#echo "exit;" >> $pubfile +#echo "?>" >> $pubfile +# End Make redirect Page + +# Publish files +#scp -r $targetpath matmoul@web.sourceforge.net:/home/frs/project/$prjname/release/ +#scp -r $pubfile matmoul@web.sourceforge.net:/home/project-web/$prjname/htdocs/$prjname/ +# End Publish files