1
0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-15 17:51:33 +01:00
This commit is contained in:
kprkpr
2016-11-07 22:39:44 +01:00
parent 4828905f7b
commit b6a1429d52

View File

@@ -559,9 +559,10 @@ if [[ $nooptprogs != "1" ]];then
*2*) packages="$packages ttf-dejavu";;& *2*) packages="$packages ttf-dejavu";;&
*3*) packages="$packages ttf-ms-fonts";;& *3*) packages="$packages ttf-ms-fonts";;&
*4*) packages="$packages ttf-google-fonts-git" *4*) packages="$packages ttf-google-fonts-git"
packages=${packages//noto-fonts / } #Delete noto-fonts from the list (The command is right with this spaces, because if not, it will remove variations like cjk, that google fonts doesnt provide #Delete (Package per line) possible packages that conficts with ttf-google-fonts-git
execl chroot pacman -Rdd noto-fonts --noconfirm --needed #This is because ttf-google-fonts provides noto-fonts (But not noto-fonts-cjk neither noto-fonts-emoji 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
;;&
esac esac
case $opt6 in case $opt6 in
*1*) packages="$packages evince";;& *1*) packages="$packages evince";;&
@@ -863,8 +864,7 @@ do
case $opt in case $opt in
"No, volver a empezar") "No, volver a empezar")
rm /tmp/install.log rm /tmp/install.log
logout exec ./selectlang.sh
exit
break;; break;;
"Si, instalar") break;; "Si, instalar") break;;
"No, apagar el ordenador") "No, apagar el ordenador")