From cbab0dfede1411ed8317082dae2af9c0c6ec1fb3 Mon Sep 17 00:00:00 2001
From: Bernhard Landauer <oberon@manjaro.org>
Date: Thu, 23 Feb 2017 02:42:14 +0100
Subject: [PATCH] set_timezone rm posix, KDE doesn't seem to like it

---
 lib/util-base.sh    |  4 ++--
 lib/util-desktop.sh | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/util-base.sh b/lib/util-base.sh
index 5b02480..cb7112d 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -77,7 +77,7 @@ set_timezone() {
     DIALOG " $_ConfBseTimeHC " --yesno "$_TimeZQ ${ZONE}/${SUBZONE}?" 0 0
 
     if [[ $? -eq 0 ]]; then
-        arch_chroot "ln -sf /usr/share/zoneinfo/posix/${ZONE}/${SUBZONE} /etc/localtime" 2>$ERR
+        arch_chroot "ln -sf /usr/share/zoneinfo/${ZONE}/${SUBZONE} /etc/localtime" 2>$ERR
         check_for_error "$FUNCNAME" "$?"
     else
         config_base_menu
@@ -679,7 +679,7 @@ setup_graphics_card() {
         sed -i 's/MODULES=""/MODULES="nouveau"/' ${MOUNTPOINT}/etc/mkinitcpio.conf
     fi
 
-    check_for_error "$FUNCNAME" "$?"
+    check_for_error "$FUNCNAME $(cat /tmp/.driver)" "$?"
 
     install_graphics_menu
 }
diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh
index 069469f..9182870 100644
--- a/lib/util-desktop.sh
+++ b/lib/util-desktop.sh
@@ -172,17 +172,19 @@ install_manjaro_de_wm() {
             # remove zsh
             sed -i '/^zsh$/d' /tmp/.edition
 
-            check_for_error "install pkgs: $(cat /tmp/.desktop)" "$?"
-
             # basestrap the parsed package list to the new root
-            basestrap -i ${MOUNTPOINT} $(cat /tmp/.edition /usr/share/manjaro-architect/package-lists/input-drivers | sort | uniq)
+            basestrap -i ${MOUNTPOINT} $(cat /tmp/.edition /usr/share/manjaro-architect/package-lists/input-drivers | sort | uniq) 2>$ERR
+            check_for_error "install pkgs: $(cat /tmp/.desktop)" "$?"
 
             # copy the profile overlay to the new root
             echo "Copying overlay files to the new root"
             cp -r "$overlay"* ${MOUNTPOINT} 2>$ERR
-            check_for_error "${overlay}* ${MOUNTPOINT}" "$?"
+            check_for_error "copy overlay" "$?"
+
             # Copy settings to root account
-            cp -ar $MOUNTPOINT/etc/skel/. $MOUNTPOINT/root/
+            cp -ar $MOUNTPOINT/etc/skel/. $MOUNTPOINT/root/ 2>$ERR
+            check_for_error "copy root config" "$?"
+
             # copy settings to already created users
             if [[ -e "$(echo /mnt/home/*)" ]]; then
             for home in $(echo $MOUNTPOINT/home/*); do