diff --git a/archinstall/chrootinstall.sh b/archinstall/chrootinstall.sh index a3eb8d3..c6a4471 100755 --- a/archinstall/chrootinstall.sh +++ b/archinstall/chrootinstall.sh @@ -9,7 +9,7 @@ sclang=$1 source translations.sh argpart=$(echo $particionraiz | cut -c1-3) -if [[ -f /mnt/etc/pacman.conf.post ]];then # Is an offline installation? +if [[ -f /etc/pacman.conf.post ]];then # Is an offline installation? isoffline=1 else isoffline=0 @@ -89,7 +89,7 @@ hwclock --systohc --utc echo "$(T "Syncing hour to internet")"; pacman -S ntp --noconfirm systemctl enable ntpd -if [[ isoffline = 0 ]];then +if [[ $isoffline = 0 ]];then ntpd -qg hwclock -w else @@ -99,7 +99,7 @@ fi function userpass { -if [[ -f /mnt/etc/pacman.conf.post ]];then # Is an offline installation? +if [[ $isoffline = 1 ]];then # Is an offline installation? tar xJf /run/archiso/offlinefiles/mods/skel.tar.gz -C / else #online wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.gz -O- | tar xJf - -C / @@ -137,7 +137,7 @@ case $optgrafica in 3) pacman -S xf86-video-intel libva-intel-driver libvdpau-va-gl --noconfirm;; 4) pacman -S xf86-video-openchrome --noconfirm;; 5) pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --noconfirm;; - 6) pacman -S xf86-video-vmware xf86-input-vmmouse --noconfirm;; + 6) pacman -S xf86-video-vmware xf86-input-vmmouse open-vm-tools --noconfirm;; 7) pacman -S $(pacman -Ssq xf86-video-*) --noconfirm;; esac #Instalar siempre la estandar, por se acaso @@ -297,7 +297,7 @@ case $optentorno in baseconX pacman -S lxappearance lxappearance-obconf lxde-common lxinput lxpanel lxrandr lxsession lxtask lxterminal openbox pcmanfm xfce4-notifyd --noconfirm pacman -S gtk-engine-aurora faenza-icon-theme --noconfirm - if [[ -f /mnt/etc/pacman.conf.post ]];then # Is an offline installation? + if [[ $isoffline = 1 ]];then # Is an offline installation? tar xJf /run/archiso/offlinefiles/mods/LXDE.tar.xz -C / else #online wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/LXDE.tar.xz -O- | tar xJf - -C / @@ -307,7 +307,7 @@ case $optentorno in baseconX pacman -S xfce4 --noconfirm pacman -S faenza-icon-theme --noconfirm - if [[ -f /mnt/etc/pacman.conf.post ]];then # Is an offline installation? + if [[ $isoffline = 1 ]];then # Is an offline installation? tar xJf /run/archiso/offlinefiles/mods/XFCE4.tar.xz -C / else #online wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/XFCE4.tar.xz -O- | tar xJf - -C / @@ -473,7 +473,5 @@ sync if [[ $isoffline = 1 ]];then # Is an offline installation? echo "Configurando pacman para usar servidores web en los siguientes arranques..." -mv -f /mnt/etc/pacman.conf.post /mnt/etc/pacman.conf -fi - - +mv -f /etc/pacman.conf.post /etc/pacman.conf +fi \ No newline at end of file