From 086d46f0587a90326bbfa640b31d87a3173482b6 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Tue, 11 Sep 2018 22:15:04 -0500 Subject: [PATCH] Install script fixes --- scripts/InstallScripts/InstallPackages.sh | 4 ++-- scripts/buildDebianFs.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index d0348fc..e5d34e1 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -4,7 +4,7 @@ DIR=/InstallResources while true; do read -p "install (X)fce4 or (L)xqt" XL - case $yn in + case $XL in [Xx]* ) DE=xfce; break;; [Ll]* ) DE=lxqt; break;; * ) echo "Please answer (X)fce4 or (L)xqt";; @@ -16,7 +16,7 @@ locale-gen apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils xserver-xorg-input-synaptics mousepad vlc apt install -y wicd-daemon wicd wicd-curses wicd-gtk -[ "$DE" = "xfce" ] && apt install -y xfce4 default-dbus-session-bus system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies +[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies [ "$DE" = "lxqt" ] && apt install -y lxqt #Copy in acpi, pulse audio, trackpad settings, funtion key settings diff --git a/scripts/buildDebianFs.sh b/scripts/buildDebianFs.sh index 9dcadeb..8188a23 100755 --- a/scripts/buildDebianFs.sh +++ b/scripts/buildDebianFs.sh @@ -92,7 +92,7 @@ chroot $outmnt apt-get autoremove --purge chroot $outmnt apt-get clean #Download the packages to be installed by Install.sh: TODO: potentially dpkg-reconfigure locales? -chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt wicd-daemon wicd wicd-curses wicd-gtk xserver-xorg-input-synaptics crda xfce4 default-dbus-session-bus system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies +chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt wicd-daemon wicd wicd-curses wicd-gtk xserver-xorg-input-synaptics crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 #Cleanup hosts