From 754388cd71ff235c44ee498376ed913349a155a0 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Tue, 8 Nov 2016 12:25:05 +0000 Subject: [PATCH] Update archinstall.sh Change fonts to "Basic fonts" , "Microsoft fonts" and "Recopilatorio de Google" --- archinstall/archinstall.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh index d38c24d..3c3704b 100755 --- a/archinstall/archinstall.sh +++ b/archinstall/archinstall.sh @@ -511,7 +511,7 @@ case $tipoinstall in 2) opt2=`dialog --stdout --scrollbar --checklist "Editores de texto y Office" 0 0 7 1 "Libreoffice (Recomendado)" $(optstate "$opt2" 1) 2 "AbiWord" $(optstate "$opt2" 2) 3 "Gnumeric" $(optstate "$opt2" 3) 4 "WPS Office" $(optstate "$opt2" 4) 5 "leafpad (Bloc de notas)" $(optstate "$opt2" 5) 6 "gedit" $(optstate "$opt2" 6) 7 "notepadqq" $(optstate "$opt2" 7)`;; 3) opt3=`dialog --stdout --checklist "Audio y Video" 0 0 6 1 "VLC (Recomendado)" $(optstate "$opt3" 1) 2 "SMPlayer" $(optstate "$opt3" 2) 3 "Totem" $(optstate "$opt3" 3) 4 "Clementine" $(optstate "$opt3" 4) 5 "Banshee" $(optstate "$opt3" 5)`;; 4) opt4=`dialog --stdout --checklist "Imagen" 0 0 6 1 "GIMP" $(optstate "$opt4" 1) 2 "Inkscape" $(optstate "$opt4" 2) 3 "Pinta" $(optstate "$opt4" 3) 4 "Krita (Dibujo)" $(optstate "$opt4" 4)`;; - 5) opt5=`dialog --stdout --checklist "Fuentes/Tipos de letra" 0 0 6 1 "noto-fonts (Muy recomendado)" $(optstate "$opt5" 1) 2 "Dejavu fonts" $(optstate "$opt5" 2) 3 "Microsoft Fonts" $(optstate "$opt5" 3) 4 "Recopilatorio de fuentes de Google (mas de 300)" $(optstate "$opt5" 4)`;; + 5) opt5=`dialog --stdout --checklist "Fuentes/Tipos de letra" 0 0 6 1 "Fuentes basicas (Noto,devaju,liberation..)" $(optstate "$opt5" 1) 2 "Microsoft Fonts" $(optstate "$opt5" 2) 3 "Recopilatorio de fuentes de Google (mas de 300)" $(optstate "$opt5" 3)`;; 6) opt6=`dialog --stdout --checklist "Recomendado pulsar todos \nUtilidades basicas" 0 0 6 1 "Evince (Lector PDF)" $(optstate "$opt6" 1) 2 "Ristretto (imagenes jpg,png...)" $(optstate "$opt6" 2) 3 "Cacluladora" $(optstate "$opt6" 3)`;; 7) opt7=`dialog --stdout --checklist "Soportes (Impresoras,Bluetooth...)" 0 0 6 1 "CUPS (Soporte impresoras)" $(optstate "$opt7" 1) 2 "HPLIP (Soporte impresoras HP)" $(optstate "$opt7" 2) 3 "Bluetooth" $(optstate "$opt7" 3)`;; 8) opt8=`dialog --stdout --scrollbar --checklist "Utilidades varias" 0 0 8 1 "Dropbox" $(optstate "$opt8" 1) 2 "MEGA" $(optstate "$opt8" 2) 3 "Visor de correo Evolution" $(optstate "$opt8" 3) 4 "Grabador de discos (k3b)" $(optstate "$opt8" 4) 5 "Java (jre8)" $(optstate "$opt8" 5) 6 "Wine ('Emulador' de programas de Windows)" $(optstate "$opt8" 6) 7 "BleachBit (Limpiador de disco duro)" $(optstate "$opt8" 7) 8 "File-roller (Compresor/descompresor, muy recomendado)" $(optstate "$opt8" 8)`;; @@ -562,10 +562,9 @@ if [[ $nooptprogs != "1" ]];then *4*) packages="$packages krita";;& esac case $opt5 in - *1*) packages="$packages noto-fonts noto-fonts-cjk noto-fonts-emoji";;& - *2*) packages="$packages ttf-dejavu";;& - *3*) packages="$packages ttf-ms-fonts";;& - *4*) packages="$packages ttf-google-fonts-git" + *1*) packages="$packages noto-fonts noto-fonts-cjk noto-fonts-emoji ttf-dejavu ttf-liberation";;& + *2*) packages="$packages ttf-ms-fonts";;& + *3*) packages="$packages ttf-google-fonts-git" #Delete (Package per line) possible packages that conficts with ttf-google-fonts-git execl chroot pacman -Rdd noto-fonts --noconfirm execl chroot pacman -Rdd ttf-inconsolata --noconfirm #This is because ttf-google-fonts provides noto-fonts (But not noto-fonts-cjk neither noto-fonts-emoji