From 03ea0e00958e8126096a023c321d87c93fd4e1b0 Mon Sep 17 00:00:00 2001 From: JoseluCross Date: Tue, 31 May 2016 21:27:45 +0200 Subject: [PATCH] Change downloadinstall.sh --- archinstall/downloadinstall.sh | 10 ++++++---- archinstall/pacman.conf | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/archinstall/downloadinstall.sh b/archinstall/downloadinstall.sh index 82bdcd1..81e34d7 100755 --- a/archinstall/downloadinstall.sh +++ b/archinstall/downloadinstall.sh @@ -16,12 +16,14 @@ echo "Vamos a comprobar que tienes conexión a internet" ping 8.8.8.8 -c3 if [[ $? != 0 ]];then clear -echo "No tienes o no has conseguido conexión a internet" -echo "Se va a reiniciar el instalador" -echo "Presione enter para continuar" -read +dialog --title "Conexión" --msgbox "Error en la conexión \nse reiniciará la instalación \nPulse enter para continuar" 15 60 exec ./downloadinstall.sh fi wget https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/archinstall.sh -O archinstall.sh +if [ $(cat archinstall | grep "^<\!DOCTYPE html>") == "<\!DOCTYPE html>" ];then + clear + dialog --title "Descarga incorrecta" --msgbox "La descarga del instalador ha fallado \nse reiniciará la instalación \nPulse enter para continuar" 15 60 + exec ./downloadinstall.sh +fi chmod +x archinstall.sh ./archinstall.sh \ No newline at end of file diff --git a/archinstall/pacman.conf b/archinstall/pacman.conf index c4ca97c..8f0e379 100644 --- a/archinstall/pacman.conf +++ b/archinstall/pacman.conf @@ -70,6 +70,7 @@ Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist #Repo of JKArch + [jkanetwork] SigLevel = Optional TrustAll Server = http://repo.jkanetwork.com/repo/$repo/