From 58c7cef8f53cdccd161db514b5f04d0054751934 Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Fri, 17 Feb 2017 21:36:33 +0100
Subject: [PATCH] rm >sonar and >manjaro flags, add zsh-config

---
 lib/util-desktop.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh
index f8fac74..bf11e58 100644
--- a/lib/util-desktop.sh
+++ b/lib/util-desktop.sh
@@ -147,6 +147,9 @@ install_manjaro_de_wm() {
         sed -i 's/>extra //g' /tmp/.edition
         sed -i '/>basic/d' /tmp/.edition
     fi
+        # remove >manjaro flags and >sonar flags+pkgs until we support it properly
+        sed -i '/>sonar/d' /tmp/.edition
+        sed -i 's/>manjaro //g' /tmp/.edition
         # Remove commented lines
         # remove everything except the first word of every lines
         sed -i 's/\s.*$//' /tmp/.edition
@@ -236,7 +239,7 @@ install_manjaro_de_wm() {
 
         # Offer to install various "common" packages.
 
-        DIALOG " $_InstComTitle " --checklist "$_InstComBody $_UseSpaceBar" 0 50 13 \
+        DIALOG " $_InstComTitle " --checklist "$_InstComBody $_UseSpaceBar" 0 50 20 \
           "manjaro-settings-manager" "-" off \
           "pamac" "-" off \
           "octopi" "-" off \
@@ -246,7 +249,8 @@ install_manjaro_de_wm() {
           "fisherman" "-" off \
           "zsh" "-" on \
           "zsh-completions" "-" on \
-          "grml-zsh-config" "-" on \
+          "manjaro-zsh-config" "-" on \
+          "grml-zsh-config" "-" off \
           "mhwd-chroot" "-" off \
           "bmenu" "-" on \
           "clonezilla" "-" off \