diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh index 70e5acf..7e862d9 100755 --- a/archinstall/archinstall.sh +++ b/archinstall/archinstall.sh @@ -77,16 +77,6 @@ echo "Desmontando posibles particiones" umount /mnt/* umount /mnt/ particiones -echo "Ahora vamos a conectarnos a internet" -echo "¿Funcionas por Wi-Fi?" -options=("Si" "No") -select opt in "${options[@]}" -do - case $opt in - "Si") wifi-menu;break;; - *) break;; - esac -done echo "Ok, vamos a comenzar la instalacion, pero antes, un resumen de donde lo va a instalar." lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL diff --git a/archinstall/chrootinstall.sh b/archinstall/chrootinstall.sh index 336280f..5cf2945 100755 --- a/archinstall/chrootinstall.sh +++ b/archinstall/chrootinstall.sh @@ -9,7 +9,8 @@ options=($(cat /etc/locale.gen | grep '^#[a-ZA-Z]' | cut -c2-30 | cut -f1 -d"_" select opt in "${options[@]}" do case $opt in - *) langabr=$opt;break;; + [1-9]*) langabr=$opt;break;; + *) echo "Invalid option";; esac done clear @@ -17,7 +18,8 @@ options=($(cat /etc/locale.gen | grep '^#'$langabr | cut -c2-30 | cut -f1 -d" " select opt in "${options[@]}" do case $opt in - *) opclang=$opt;break;; + [1-9]*) opclang=$opt;break;; + *) echo "Invalid option";; esac done diff --git a/archinstall/downloadinstall.sh b/archinstall/downloadinstall.sh index 448ddff..b0c28d5 100755 --- a/archinstall/downloadinstall.sh +++ b/archinstall/downloadinstall.sh @@ -1,4 +1,16 @@ #!/bin/bash +echo "Bienvenido a JKArch" +echo "Arrancando instalador.." +echo "Se necesita tener internet para la instalación" +echo "¿Estas mediante Wi-Fi, o por cable?" +options=("Wi-Fi" "Cable") +select opt in "${options[@]}" +do + case $opt in + "Wi-Fi") wifi-menu;break;; + *) break;; + esac +done wget https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/archinstall.sh -O archinstall.sh chmod +x archinstall.sh ./archinstall.sh \ No newline at end of file