From aa976eda09f6a9a703f260c43d249988a2eeed92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Mon, 15 Mar 2021 10:57:45 +0100
Subject: [PATCH] [release] 0.15.12 - remove GIS

---
 Makefile         | 2 +-
 lib/util-yaml.sh | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index c55743a..7f3dd0c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-Version=0.15.11
+Version=0.15.12
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc
diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 6a5a680..2c998a6 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -290,14 +290,14 @@ write_settings_conf(){
     echo "sequence:" >> "$conf"
     echo "    - show:" >> "$conf"
     echo "        - welcome" >> "$conf" && write_welcome_conf
-    if ${oem_used} || [[ ${profile} == "gnome" ]]; then
+    if ${oem_used}; then
         msg2 "Skipping to show locale and keyboard modules."
     else
         echo "        - locale" >> "$conf" && write_locale_conf
         echo "        - keyboard" >> "$conf"
     fi
     echo "        - partition" >> "$conf"
-    if ${oem_used} || [[ ${profile} == "gnome" ]]; then
+    if ${oem_used}; then
         msg2 "Skipping to show users module."
     else
         echo "        - users" >> "$conf" && write_users_conf
@@ -333,7 +333,7 @@ write_settings_conf(){
     fi
     echo "        - machineid" >> "$conf" && write_machineid_conf
     echo "        - fstab" >> "$conf"
-    if ${oem_used} || [[ ${profile} == "gnome" ]]; then
+    if ${oem_used}; then
         msg2 "Skipping to set locale, keyboard and localecfg modules."
     else
         echo "        - locale" >> "$conf"
@@ -347,8 +347,6 @@ write_settings_conf(){
     if ${oem_used}; then
         msg2 "Skipping to set users module."
         echo "        - oemuser" >> "$conf"
-    elif [[ ${profile} == "gnome" ]]; then
-        msg2 "Skipping to set users module."
     else
         echo "        - users" >> "$conf"
     fi