From b79ec9f5b27aa35d42a07ba0fb858a2987e10c04 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Tue, 1 Sep 2015 04:57:58 +0200 Subject: [PATCH] Clean LXDE code --- install/desktop/lxde/packages | 7 +++---- install/desktop/menu | 7 +------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/install/desktop/lxde/packages b/install/desktop/lxde/packages index dd18aa2..c9aef41 100644 --- a/install/desktop/lxde/packages +++ b/install/desktop/lxde/packages @@ -3,13 +3,12 @@ options=() -package="" -items=$(pacman -Sqg $package) +items=$(pacman -Sqg lxde) for item in $items; do options+=("$item" "" on) done -sel=$(whiptail --backtitle "$apptitle" --title "$package Install :" --checklist "" --cancel-button "Back" 0 0 0 \ +sel=$(whiptail --backtitle "$apptitle" --title "LXDE Install :" --checklist "" --cancel-button "Back" 0 0 0 \ "${options[@]}" \ 3>&1 1>&2 2>&3) @@ -25,7 +24,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in - 'lxdm') svcenable lxdm;; + '"lxdm"') svcenable lxdm;; esac done diff --git a/install/desktop/menu b/install/desktop/menu index c79c548..9a1991c 100644 --- a/install/desktop/menu +++ b/install/desktop/menu @@ -30,12 +30,7 @@ case $sel in 'Gnome') menu install/desktop/gnome/menu;; 'Plasma5') menu install/desktop/plasma5/menu;; 'Cinnamon') script install/desktop/cinnamon/packages;; - 'LXDE') - require install/desktop/lxde/packages 755 - sed -i "/^package=/c\package=\"lxde\"" install/desktop/lxde/packages - script install/desktop/lxde/packages - svcenable lxdm - ;; + 'LXDE') script install/desktop/lxde/packages;; 'LXQt') menu install/desktop/lxqt/menu;; 'Mate') menu install/desktop/mate/menu;; 'Enlightenment') script install/desktop/enlightenment/packages;;