diff --git a/CHANGELOG b/CHANGELOG index 5c8ce7a..135f95d 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +Builder : +- Updated build process. + +Archdi : +- Add menu to select source server. + + Current Version : ----------------- @@ -12,8 +19,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..329ec12 100755 --- a/archfi +++ b/archfi @@ -2,8 +2,11 @@ # 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 @@ -13,7 +16,6 @@ apptitle="Arch Linux Fast Install (archfi) - Version: 2015.07.19.04.55.32 (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/learn/English b/learn/English old mode 100755 new mode 100644 diff --git a/lng/French b/lng/French old mode 100755 new mode 100644 index 2350010..3bb87e6 --- 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"