Add Multi Source Support for archdi

This commit is contained in:
MatMoul 2015-08-20 19:14:17 +02:00
parent 040a938eca
commit 5813483872
4 changed files with 41 additions and 7 deletions

View file

@ -1,3 +1,10 @@
Builder :
- Updated build process.
Archdi :
- Add menu to select source server.
Current Version : Current Version :
----------------- -----------------
@ -12,8 +19,7 @@ Version : 2015.07.19.04.55.32 :
------------------------------- -------------------------------
Archdi : Archdi :
- Update URL to github, - Update URL to github.
Version : 2015.06.28.20.37.40 : Version : 2015.06.28.20.37.40 :

36
archfi
View file

@ -2,8 +2,11 @@
# Arch Linux Fast Install (archfi) # 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 # project : https://github.com/MatMoul/archfi
# http://sourceforge.net/projects/archfi/
# license : LGPL-3.0 (http://opensource.org/licenses/lgpl-3.0.html) # license : LGPL-3.0 (http://opensource.org/licenses/lgpl-3.0.html)
# #
# referance : https://wiki.archlinux.org/index.php/Installation_guide # 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 baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
# -------------------------------------------------------- # --------------------------------------------------------
mainmenu(){ mainmenu(){
if [ "$1" = "" ]; then if [ "$1" = "" ]; then
@ -985,10 +987,30 @@ installarchdi(){
fi fi
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(){ archdiinstallandlaunchchroot(){
cd cd
#curl -L archdi.sourceforge.net/archdi >archdi #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 sh archdi -i
archdi --chroot archdi --chroot
exit exit
@ -996,7 +1018,8 @@ archdiinstallandlaunchchroot(){
archdilaunchchroot(){ archdilaunchchroot(){
cd cd
#curl -L archdi.sourceforge.net/archdi >archdi #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 sh archdi --chroot
rm archdi rm archdi
exit exit
@ -1004,7 +1027,8 @@ archdilaunchchroot(){
archdiinstallchroot(){ archdiinstallchroot(){
cd cd
#curl -L archdi.sourceforge.net/archdi >archdi #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 sh archdi -i
exit exit
} }
@ -1018,6 +1042,8 @@ pressanykey(){
} }
loadstrings(){ loadstrings(){
txtselectserver="Select source server :"
txtmainmenu="Main Menu" txtmainmenu="Main Menu"
txtlanguage="Language" txtlanguage="Language"
txtsetkeymap="Set Keyboard Layout" txtsetkeymap="Set Keyboard Layout"

0
learn/English Executable file → Normal file
View file

2
lng/French Executable file → Normal file
View file

@ -6,6 +6,8 @@
# notes : misc text... # notes : misc text...
txtselectserver="Sélectionnez le serveur source :"
txtmainmenu="Menu Principal" txtmainmenu="Menu Principal"
txtlanguage="Language" txtlanguage="Language"
txtsetkeymap="Disposition clavier" txtsetkeymap="Disposition clavier"