From 209a4bb74f6998f80efcd4a2e103c4f4a7de4633 Mon Sep 17 00:00:00 2001 From: JKANetwork Date: Mon, 16 Jan 2017 00:33:52 +0100 Subject: [PATCH] Delete stupid pak var and change with directly good var allpackages --- archinstall/archinstall-dev.sh | 43 ++++++++++++++-------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/archinstall/archinstall-dev.sh b/archinstall/archinstall-dev.sh index b7149f1..5001e6d 100755 --- a/archinstall/archinstall-dev.sh +++ b/archinstall/archinstall-dev.sh @@ -376,8 +376,7 @@ function installconf { # Var allpackages have in this moment all the packages selected by user, and will be the install packages list for pacman # # Do allpackages var contain base packages and NTP daemon (Hour sync) - pak="jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils bash-completion ntp" - allpackages=$allpackages" "$pak + allpackages=$allpackages" jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils bash-completion ntp" # GUI and apps selected in "entorno{}" @@ -601,19 +600,17 @@ function graficos { optgrafica=`dialog --stdout --nocancel --scrollbar --menu "$(T "What is your graphics card brand?")" 0 0 6 1 "Nvidia" 2 "AMD/ATI" 3 "Intel" 4 "VIA" 5 "Estoy usando VirtualBox" 6 "Estoy usando VMWare" 7 "No se la marca/Otra (Se instalaran todos los drivers graficos estandar)"` case $optgrafica in - 1) pak="xf86-video-nouveau libva-vdpau-driver mesa-vdpau";; - 2) pak="xf86-video-ati xf86-video-amdgpu libva-mesa-driver libva-vdpau-driver mesa-vdpau";; - 3) pak="xf86-video-intel libva-intel-driver libvdpau-va-gl";; - 4) pak="xf86-video-openchrome";; - 5) pak="virtualbox-guest-utils virtualbox-guest-modules-arch";; - 6) pak="xf86-video-vmware xf86-input-vmmouse open-vm-tools";; - 7) pak=$(execl chroot pacman -Ssq xf86-video-*);; + 1) allpackages=$allpackages" xf86-video-nouveau libva-vdpau-driver mesa-vdpau";; + 2) allpackages=$allpackages" xf86-video-ati xf86-video-amdgpu libva-mesa-driver libva-vdpau-driver mesa-vdpau";; + 3) allpackages=$allpackages" xf86-video-intel libva-intel-driver libvdpau-va-gl";; + 4) allpackages=$allpackages" xf86-video-openchrome";; + 5) allpackages=$allpackages" virtualbox-guest-utils virtualbox-guest-modules-arch";; + 6) allpackages=$allpackages" xf86-video-vmware xf86-input-vmmouse open-vm-tools";; + 7) allpackages=$allpackages" "$(execl chroot pacman -Ssq xf86-video-*);; esac - allpackages=$allpackages" "$pak #Instalar siempre la estandar, por se acaso - pak="xf86-video-vesa mesa-libgl" - allpackages=$allpackages" "$pak + allpackages=$allpackages" xf86-video-vesa mesa-libgl" } ##Interactive function for make user select programs @@ -748,40 +745,36 @@ function entorno { case $optentorno in 1) - pak="lxappearance lxappearance-obconf lxde-common lxinput lxpanel lxrandr lxsession lxtask lxterminal openbox pcmanfm xfce4-notifyd gtk-engine-aurora faenza-icon-theme" + allpackages=$allpackages" lxappearance lxappearance-obconf lxde-common lxinput lxpanel lxrandr lxsession lxtask lxterminal openbox pcmanfm xfce4-notifyd gtk-engine-aurora faenza-icon-theme" #Themes: gtk-engine-aurora faenza-icon-theme ;; - 2) pak="xfce4 faenza-icon-theme";; - 3) pak="cinnamon";; + 2) allpackages=$allpackages" xfce4 faenza-icon-theme";; + 3) allpackages=$allpackages" cinnamon";; 4) optgnome=`dialog --stdout --nocancel --menu "¿Gnome base o gnome con sus extras?" 0 0 5 1 "Gnome base" 2 "Gnome+extras"` case $optgnome in - 1) pak="gnome";; - 2) pak="gnome gnome-extra";; + 1) allpackages=$allpackages" gnome";; + 2) allpackages=$allpackages" gnome gnome-extra";; esac #In installconf, it has to remove gdm ;; 5) optmate=`dialog --stdout --nocancel --menu "¿MATE base o MATE con sus extras?" 0 0 5 1 "MATE base" 2 "MATE+extras"` case $optmate in - 1) pak="mate gtk-engine-murrine";; - 2) pak="mate mate-extra gtk-engine-murrine";; + 1) allpackages=$allpackages" mate gtk-engine-murrine";; + 2) allpackages=$allpackages" mate mate-extra gtk-engine-murrine";; esac ;; 6) - pak="plasma" + allpackages=$allpackages" plasma" #Remove plasma-mediacenter ksshaskpass after, in installconf ;; esac - #Pass pak to allpackages - allpackages=$allpackages" "$pak - # Basic programs (Xorg) and audio support if there is selected any if [[ $optentorno != 7 ]];then - pak="xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks networkmanager network-manager-applet gnome-keyring xdialog lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs jkarch-appearance xfce4-power-manager" #Gestor de energia xfce4-power-manager - allpackages=$allpackages" "$pak + allpackages=$allpackages" xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks networkmanager network-manager-applet gnome-keyring xdialog lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs jkarch-appearance xfce4-power-manager" fi }