Update crlf

This commit is contained in:
MatMoul 2016-05-24 23:38:47 +02:00
parent 6ffd4cc95d
commit 3ffd672b76

42
archfi
View file

@ -902,7 +902,7 @@ archsetkeymap(){
archsetfont(){ archsetfont(){
items=$(find /usr/share/kbd/consolefonts/*.psfu.gz -printf "%f\n") items=$(find /usr/share/kbd/consolefonts/*.psfu.gz -printf "%f\n")
options=() options=()
for item in $items; do for item in $items; do
options+=("${item%%.*}" "") options+=("${item%%.*}" "")
@ -958,8 +958,8 @@ archsettime(){
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
return 1 return 1
fi fi
items=$(ls /mnt/usr/share/zoneinfo/$timezone/) items=$(ls /mnt/usr/share/zoneinfo/$timezone/)
options=() options=()
for item in $items; do for item in $items; do
@ -972,12 +972,12 @@ archsettime(){
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
return 1 return 1
fi fi
clear clear
echo "ln -sf /mnt/usr/share/zoneinfo/$timezone /mnt/etc/localtime" echo "ln -sf /mnt/usr/share/zoneinfo/$timezone /mnt/etc/localtime"
ln -sf /usr/share/zoneinfo/$timezone /mnt/etc/localtime ln -sf /usr/share/zoneinfo/$timezone /mnt/etc/localtime
pressanykey pressanykey
if (whiptail --backtitle "$apptitle" --title "$txtsettime" --yesno "$txtuseutcclock" 0 0) then if (whiptail --backtitle "$apptitle" --title "$txtsettime" --yesno "$txtuseutcclock" 0 0) then
clear clear
archchroot settimeutc archchroot settimeutc
@ -985,9 +985,9 @@ archsettime(){
clear clear
archchroot settimelocal archchroot settimelocal
fi fi
pressanykey pressanykey
} }
archsettimeutcchroot(){ archsettimeutcchroot(){
echo "hwclock --systohc --utc" echo "hwclock --systohc --utc"
@ -1052,7 +1052,7 @@ archinstallgrub(){
echo "pacstrap /mnt grub" echo "pacstrap /mnt grub"
pacstrap /mnt grub pacstrap /mnt grub
pressanykey pressanykey
if [ "$eficomputer" == "1" ]; then if [ "$eficomputer" == "1" ]; then
if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then if [ "$efimode" == "1" ]||[ "$efimode" == "2" ]; then
if (whiptail --backtitle "$apptitle" --title "${txtinstall//%1/efibootmgr}" --yesno "$txtefibootmgr" 0 0) then if (whiptail --backtitle "$apptitle" --title "${txtinstall//%1/efibootmgr}" --yesno "$txtefibootmgr" 0 0) then
@ -1070,7 +1070,7 @@ archinstallgrub(){
fi fi
fi fi
fi fi
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
if (whiptail --backtitle "$apptitle" --title "${txtinstall//%1/grub}" --yesno "$txtgrubluksdetected" 0 0) then if (whiptail --backtitle "$apptitle" --title "${txtinstall//%1/grub}" --yesno "$txtgrubluksdetected" 0 0) then
clear clear
@ -1079,7 +1079,7 @@ archinstallgrub(){
pressanykey pressanykey
fi fi
fi fi
clear clear
archchroot installgrub archchroot installgrub
pressanykey pressanykey
@ -1248,16 +1248,16 @@ pressanykey(){
} }
loadstrings(){ loadstrings(){
locale=en_US.UTF-8 locale=en_US.UTF-8
#font= #font=
txtexit="Exit" txtexit="Exit"
txtback="Back" txtback="Back"
txtignore="Ignore" txtignore="Ignore"
txtselectserver="Select source server :" txtselectserver="Select source server :"
txtmainmenu="Main Menu" txtmainmenu="Main Menu"
txtlanguage="Language" txtlanguage="Language"
txtsetkeymap="Set Keyboard Layout" txtsetkeymap="Set Keyboard Layout"
@ -1297,10 +1297,10 @@ loadstrings(){
txtluksdevicecreated="luks device created !" txtluksdevicecreated="luks device created !"
txtinstallmenu="Install Menu" txtinstallmenu="Install Menu"
txtarchinstallmenu="Arch Install Menu" txtarchinstallmenu="Arch Install Menu"
txtrungrubmakeconfig="Run grub-mkconfig ?" txtrungrubmakeconfig="Run grub-mkconfig ?"
txteditmirrorlist="Edit mirrorlist" txteditmirrorlist="Edit mirrorlist"
txtinstallarchlinux="Install Arch Linux" txtinstallarchlinux="Install Arch Linux"
txtconfigarchlinux="Config Arch Linux" txtconfigarchlinux="Config Arch Linux"
@ -1310,9 +1310,9 @@ loadstrings(){
txtsetlocale="Set Locale" txtsetlocale="Set Locale"
txtsettime="Set Time" txtsettime="Set Time"
txtsetrootpassword="Set root password" txtsetrootpassword="Set root password"
txtuseutcclock="Use UTC hardware clock ?" txtuseutcclock="Use UTC hardware clock ?"
txtoptional="Optional" txtoptional="Optional"
txtrecommandeasyinst="Recommanded for easy install" txtrecommandeasyinst="Recommanded for easy install"
txtset="Set %1" txtset="Set %1"
@ -1320,15 +1320,15 @@ loadstrings(){
txtedit="Edit %1" txtedit="Edit %1"
txtinstall="Install %1" txtinstall="Install %1"
txtenable="Enable %1" txtenable="Enable %1"
txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?" txtgrubluksdetected="Encrypted root partion !\n\nAdd cryptdevice= to GRUB_CMDLINE_LINUX in /etc/default/grub ?"
txtpressanykey="Press any key to continue." txtpressanykey="Press any key to continue."
txtinstallosprober="os-prober is a good solution if you want to use mutli-boot.\nInstall os-prober ?" txtinstallosprober="os-prober is a good solution if you want to use mutli-boot.\nInstall os-prober ?"
txtefibootmgr="efibootmgr is required for efi computer." txtefibootmgr="efibootmgr is required for efi computer."
txtarchdidesc="Full desktop install script" txtarchdidesc="Full desktop install script"
txtinstallarchdi="Arch Linux Desktop Install (archdi) is a second script who can help you to install a full workstation.\n\nYou can just launch the script or install it. Choose in the next menu.\n\nArch Linux Desktop Install as two dependencies : wget and libnewt.\n\npacstrap wget libnewt ?" txtinstallarchdi="Arch Linux Desktop Install (archdi) is a second script who can help you to install a full workstation.\n\nYou can just launch the script or install it. Choose in the next menu.\n\nArch Linux Desktop Install as two dependencies : wget and libnewt.\n\npacstrap wget libnewt ?"
txtarchdiinstallandlaunch="Install and run archdi" txtarchdiinstallandlaunch="Install and run archdi"