From c7e3c893b0937c988faf066b3088514f2195f43b Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Mon, 16 Jan 2017 17:17:22 +0100 Subject: [PATCH] Fixing things... --- ISOCreateScripts/depsjkarch.sh | 2 +- archinstall/archinstall-dev.sh | 14 +++++++------- archinstall/archinstall.sh | 14 +++++++------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ISOCreateScripts/depsjkarch.sh b/ISOCreateScripts/depsjkarch.sh index fad7c73..ab1bde1 100755 --- a/ISOCreateScripts/depsjkarch.sh +++ b/ISOCreateScripts/depsjkarch.sh @@ -15,7 +15,7 @@ mkdir trydeps pacstrap -d trydeps pacman jkarch-mirrorlist cp /etc/pacman.conf trydeps/etc/pacman.conf -arch-chroot trydeps/ /usr/bin/pacman -Sw base base-devel yaourt btrfs-progs exfat-utils jkarch-mirrorlist jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils dosfstools \ +arch-chroot trydeps/ /usr/bin/pacman -Sw base base-devel yaourt btrfs-progs rsync exfat-utils jkarch-mirrorlist jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils dosfstools \ ntfs-3g bash-completion reflector ntp \ mesa libva-vdpau-driver mesa-libgl libva-mesa-driver mesa-vdpau libva-intel-driver libvdpau-va-gl virtualbox-guest-utils virtualbox-guest-modules-arch xf86-input-vmmouse open-vm-tools \ firefox google-chrome chromium opera otter-browser flashplugin \ diff --git a/archinstall/archinstall-dev.sh b/archinstall/archinstall-dev.sh index 0772907..d0dc143 100755 --- a/archinstall/archinstall-dev.sh +++ b/archinstall/archinstall-dev.sh @@ -595,7 +595,7 @@ function installconf { fi if [[ $isoffline = "1" ]];then tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9 - execl pacstrap -C pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers + execl pacstrap -C pacman-offline.conf /mnt/ base jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location fi @@ -615,7 +615,7 @@ function installconf { fi # Create bind mountpoints for the rest of the install (Chroot) - if [[ $isoffline = 0 ]];then + if [[ $isoffline = "0" ]];then cp -r /etc/netctl/* /mnt/etc/netctl/ cp -f /etc/resolv.conf /mnt/etc/resolv.conf fi @@ -637,7 +637,7 @@ function installconf { # Before install, configure mirrorlist if its online - if [[ $isoffline = 0 ]];then + if [[ $isoffline = "0" ]];then execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist fi # Here, allpackages have the user selected packages because selected before. Then, install it @@ -720,14 +720,14 @@ function installconf { # Configure wine if neccesary - if [[ $inswine = 1 ]];then + if [[ $inswine = "1" ]];then echo "$(T "Configuring wine for better experience") (32 bit winearch)" execl chuser WINEARCH=win32 wineboot -u fi # Set X11 keyboard, and user GKSU, if there is any enviroment installed - if [[ $optentorno != 7 ]];then + if [[ $optentorno != "7" ]];then keyboardlayout # Modify gksu for ask user password and not root one execl chuser gconftool-2 --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser) @@ -853,7 +853,7 @@ function bootselect { clear mostrardialog "$(T "JKArch install script")" "$(T "Intro arch install script")" -if [[ $isoffline=0 ]];then +if [[ $isoffline = "0" ]];then mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, vuelva a probar en unas horas o con la versión offline.\nTambien podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" else mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" @@ -971,7 +971,7 @@ installconf otrasconfig # Unmount and tweak pacman if necessary (If offline) -if [[ $isoffline = 1 ]];then # Is an offline installation? +if [[ $isoffline = "1" ]];then # Is an offline installation? echo "Configurando pacman para usar servidores web en los siguientes arranques..." mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf fi diff --git a/archinstall/archinstall.sh b/archinstall/archinstall.sh index 0772907..d0dc143 100755 --- a/archinstall/archinstall.sh +++ b/archinstall/archinstall.sh @@ -595,7 +595,7 @@ function installconf { fi if [[ $isoffline = "1" ]];then tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9 - execl pacstrap -C pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers + execl pacstrap -C pacman-offline.conf /mnt/ base jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location fi @@ -615,7 +615,7 @@ function installconf { fi # Create bind mountpoints for the rest of the install (Chroot) - if [[ $isoffline = 0 ]];then + if [[ $isoffline = "0" ]];then cp -r /etc/netctl/* /mnt/etc/netctl/ cp -f /etc/resolv.conf /mnt/etc/resolv.conf fi @@ -637,7 +637,7 @@ function installconf { # Before install, configure mirrorlist if its online - if [[ $isoffline = 0 ]];then + if [[ $isoffline = "0" ]];then execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist fi # Here, allpackages have the user selected packages because selected before. Then, install it @@ -720,14 +720,14 @@ function installconf { # Configure wine if neccesary - if [[ $inswine = 1 ]];then + if [[ $inswine = "1" ]];then echo "$(T "Configuring wine for better experience") (32 bit winearch)" execl chuser WINEARCH=win32 wineboot -u fi # Set X11 keyboard, and user GKSU, if there is any enviroment installed - if [[ $optentorno != 7 ]];then + if [[ $optentorno != "7" ]];then keyboardlayout # Modify gksu for ask user password and not root one execl chuser gconftool-2 --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser) @@ -853,7 +853,7 @@ function bootselect { clear mostrardialog "$(T "JKArch install script")" "$(T "Intro arch install script")" -if [[ $isoffline=0 ]];then +if [[ $isoffline = "0" ]];then mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, vuelva a probar en unas horas o con la versión offline.\nTambien podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" else mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" @@ -971,7 +971,7 @@ installconf otrasconfig # Unmount and tweak pacman if necessary (If offline) -if [[ $isoffline = 1 ]];then # Is an offline installation? +if [[ $isoffline = "1" ]];then # Is an offline installation? echo "Configurando pacman para usar servidores web en los siguientes arranques..." mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf fi