From ec8d9844a637b774c0884ca70be226e5688648eb Mon Sep 17 00:00:00 2001 From: kprkpr Date: Thu, 2 Jun 2016 11:01:42 +0200 Subject: [PATCH] changes --- archinstall/archinstall.sh | 7 ++++--- archinstall/chrootinstall.sh | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh index fe0b771..0ad7998 100755 --- a/archinstall/archinstall.sh +++ b/archinstall/archinstall.sh @@ -170,16 +170,17 @@ if [[ $? != 0 ]];then fatalerror "Error de conexion con internet, compruebe la red" fi pacstrap -C /tmp/pacman.conf /mnt/ base -wget https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/chrootinstall.sh -O /mnt/root/chrootinstall.sh +mkdir -p /mnt/root/inst/ +wget https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/chrootinstall.sh -O /mnt/root/inst/chrootinstall.sh if [[ $? != 0 ]];then fatalerror "Error de conexion con internet, compruebe la red" fi -chmod +x /mnt/root/chrootinstall.sh +chmod +x /mnt/root/inst/chrootinstall.sh genfstab -U /mnt >> /mnt/etc/fstab cp /etc/netctl/* /mnt/etc/netctl/ mv /tmp/pacman.conf /mnt/etc/pacman.conf argpart=$(echo $particionraiz | cut -c1-3) -arch-chroot /mnt /bin/bash -c "./root/chrootinstall.sh $argpart $partefi" +arch-chroot /mnt /bin/bash -c "./root/inst/chrootinstall.sh $argpart $partefi" } clear mostrardialog "Script de instalación simple de Arch (BETA)" "Mediante unas preguntas y avanzando, instalaremos arch en su ordenador \n Ha sido pensado para ser simple, y guiado por opciones, pero debes estar atento durante el proceso." diff --git a/archinstall/chrootinstall.sh b/archinstall/chrootinstall.sh index f4d6025..f944c2c 100755 --- a/archinstall/chrootinstall.sh +++ b/archinstall/chrootinstall.sh @@ -22,6 +22,10 @@ mostrardialog "Error fatal" "Ha occurrido un error fatal, la instalacion se va a exit } +function downloadmods { +wget https://gitlab.com/JKANetwork/JKArch/raw/master/mods/splashscreen.zip -O /root/inst/splashscreen.zip +} + function horaidioma { #Idioma echo "Escoja su idioma. Se irá desde la abreviatura general, a la particular" @@ -318,9 +322,8 @@ esac function bootinstall { echo "Espere..." -wget https://gitlab.com/JKANetwork/JKArch/raw/master/mods/splashscreen/splashscreen -O /usr/bin/ +unzip -q /root/inst/splashscreen.zip -d / chmod +x /usr/bin/splashscreen -wget https://gitlab.com/JKANetwork/JKArch/raw/master/mods/splashscreen/splashscreen.service -O /etc/systemd/system/ systemctl enable splashscreen clear @@ -354,6 +357,7 @@ esac echo "Configuración de su sistema" echo "Paquetes basicos para la instalación, puede tardar un poco" pacman -Syu jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils --noconfirm --needed +downloadmods horaidioma mkinitcpio -p linux