diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh index 0e41a15..2a4523e 100755 --- a/archinstall/archinstall.sh +++ b/archinstall/archinstall.sh @@ -60,7 +60,7 @@ case $optpa in clear tput setaf 6 ; echo "$(T "Your partition scheme")" ; tput setaf 9 lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL - tput setaf 6 ; echo "Elige el disco duro a borrar y cambiar por una particion Linux simple para JKArch" ; tput setaf 9 + tput setaf 6 ; echo "$(T "Select hard disk to delete and use by JKArch")" ; tput setaf 9 options=($(lsblk --output KNAME | cut -c1-3 | sort | uniq | sed '1d' | grep 'sd\|hd') "Salir") select opt in "${options[@]}" do @@ -162,7 +162,7 @@ if [[ ! $optpa -eq 3 ]];then 2) clear lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL - tput setaf 6 ; echo "Elige la particion EFI del sistema (Si usa windows, suele ser una particion de 300-400Mb en FAT32 llamada EFI, y suele estar en /dev/sda2)" ; tput setaf 9 + tput setaf 6 ; echo "$(T "Select EFI partition")" ; tput setaf 9 options=($(lsblk --output KNAME | sed '1d'| grep 'sd\|hd')) select opt in "${options[@]}" do @@ -203,7 +203,7 @@ wget https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/pacman.conf -O if [[ $? != 0 ]];then fatalerror "$(T "Network connection error, please check it")" fi -tput setaf 2 ; echo "Optimizando la descarga..." ; tput setaf 9 +tput setaf 2 ; echo "$(T "Optimizing download")" ; tput setaf 9 reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist tput setaf 2 ; echo "Descargando..." ; tput setaf 9 pacstrap -C /tmp/pacman.conf /mnt/ base btrfs-progs diff --git a/archinstall/translations.sh b/archinstall/translations.sh index 61373b9..565a29f 100755 --- a/archinstall/translations.sh +++ b/archinstall/translations.sh @@ -72,6 +72,11 @@ case "$1" in "es") echo "Ahora se le permitira escoger un disco duro para eliminar, y reemplazar por una particion para JKArch sola y sus configuraciones estandar. \nPor favor, no es reversible, asegurese de lo que estas haciendo varias veces.";; *) echo "Now you have to select a hard disk to delete it and replace by a partition only for JKArch and standard configuration. \nIt's not reversible, please be sure of what are you doing!";; esac;; + "Select hard disk to delete and use by JKArch") + case $sclang in + "es") echo "Elige el disco duro a borrar y cambiar por una particion Linux simple para JKArch";; + *) echo "$1";; + esac;; "Select root partition") case $sclang in "es") echo "Elige la particion a usar como sistema raĆ­z ('/')";; @@ -82,6 +87,11 @@ case "$1" in "es") echo "Elige la particion a usar como home (/home)";; *) echo "Select home (/home) (users) partition";; esac;; + "Select EFI partition") + case $sclang in + "es") echo "Elige la particion EFI del sistema (Suele ser una particion de 300-500Mb en FAT32 llamada EFI, y suele estar en /dev/sda2)";; + *) echo "Select EFI partition (Normally is a 300-500Mb FAT32/vfat partition called EFI)";; + esac;; "Not valid") case $sclang in "es") echo "No valido";; @@ -161,7 +171,12 @@ case "$1" in case $sclang in "es") echo "Espere...";; *) echo "Wait...";; - esac;; + esac;; + "Optimizing download") + case $sclang in + "es") echo "Optimizando la descarga...";; + *) echo "${1}...";; + esac;; *) echo "$1";; esac } \ No newline at end of file