1
0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-15 09:41:31 +01:00
This commit is contained in:
JoseluCross
2016-10-19 15:28:44 +02:00
parent ea5169f168
commit 027319e221

View File

@@ -476,7 +476,7 @@ case $tipoinstall in
5) opt5=`dialog --stdout --checklist "Fuentes/Tipos de letra" 0 0 6 1 "noto-fonts (Muy recomendado)" $(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 \nVisores" 0 0 6 1 "Evince (PDF)" $(optstate "$opt6" 1) 2 "Ristretto (imagenes como jpg,png...)" $(optstate "$opt6" 2)`;;
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)`;;
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)`;;
9) opt9=`dialog --stdout --scrollbar --checklist "Programacion" 0 0 8 1 "Sublime Text 3" $(optstate "$opt9" 1) 2 "Sublime Text 2" $(optstate "$opt9" 2) 3 "Visual Studio Code" $(optstate "$opt9" 3) 4 "Eclipse" $(optstate "$opt9" 4) 5 "Monodevelop" $(optstate "$opt9" 5) 6 "Brackets" $(optstate "$opt9" 6) 7 "Atom" $(optstate "$opt9" 7) 8 "Gamedevelop" $(optstate "$opt9" 8) 9 "Poedit (gettext)" $(optstate "$opt9" 9) A "Arduino IDE" $(optstate "$opt9" A)`;;
"I")
#Instalar
@@ -761,42 +761,46 @@ umount /mnt/
particiones
clear
tput setaf 6
echo "$(T "Ok, last thing before start installing, summary of changes")"
echo "$(T "Partition scheme before your changes")"
tput setaf 9
lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
tput setaf 6
echo "$(T "Your changes")"
tput setaf 9
case $formatoraiz in
"mkfs.ext4 -F")
mosfraiz="$(T "ext4 formatted")";;
"mkfs.btrfs -f")
mosfraiz="$(T "btrfs formatted")";;
"mkfs.xfs -f")
mosfraiz="$(T "XFS formatted")";;
"echo No formatear ")
mosfraiz="$(T "not formatted")";;
esac
echo "$(T "Root partition"): $particionraiz , $mosfraiz"
if [[ $particionhome ]];then
case $formatohome in
"mkfs.ext4 -F")
mosfhome="$(T "ext4 formatted")";;
"mkfs.btrfs -f")
mosfhome="$(T "btrfs formatted")";;
"mkfs.xfs -f")
mosfhome="$(T "XFS formatted")";;
"echo No formatear ")
mosfhome="$(T "not formatted")";;
esac
echo "$(T "Home partition"): $particionhome , $mosfhome"
fi
if [[ $partefi ]];then
echo "$(T "EFI partition in") $partefi"
fi
tput setaf 1 ; echo "$(T "If you agree with that, press enter. If not, turn off the computer")" ; tput setaf 9
respuesta = "NO"
while [ $respuesta != FORMAT ];do
tput setaf 6
echo "$(T "Ok, last thing before start installing, summary of changes")"
echo "$(T "Partition scheme before your changes")"
tput setaf 9
lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL
tput setaf 6
echo "$(T "Your changes")"
tput setaf 9
case $formatoraiz in
"mkfs.ext4 -F")
mosfraiz="$(T "ext4 formatted")";;
"mkfs.btrfs -f")
mosfraiz="$(T "btrfs formatted")";;
"mkfs.xfs -f")
mosfraiz="$(T "XFS formatted")";;
"echo No formatear ")
mosfraiz="$(T "not formatted")";;
esac
echo "$(T "Root partition"): $particionraiz , $mosfraiz"
if [[ $particionhome ]];then
case $formatohome in
"mkfs.ext4 -F")
mosfhome="$(T "ext4 formatted")";;
"mkfs.btrfs -f")
mosfhome="$(T "btrfs formatted")";;
"mkfs.xfs -f")
mosfhome="$(T "XFS formatted")";;
"echo No formatear ")
mosfhome="$(T "not formatted")";;
esac
echo "$(T "Home partition"): $particionhome , $mosfhome"
fi
if [[ $partefi ]];then
echo "$(T "EFI partition in") $partefi"
fi
tput setaf 1 ; dialog --title "CONFIRMATION" --clear --inputbox "${T}; If you agree with that, write \"FORMAT\" If not write anything diferent)" 10 100; respuesta=$?; tput setaf 9
done
pause
baseinstall