From f16553bb2515c0bb6430efcf1d364601ffe92171 Mon Sep 17 00:00:00 2001
From: Michael Trip <m.trip@atcomputing.nl>
Date: Fri, 20 Jan 2023 11:19:13 +0100
Subject: [PATCH] fixed scripts

---
 mate/root/etc/cont-init.d/60-create-user | 13 ++++++++-----
 xfce/root/etc/cont-init.d/60-create-user | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/mate/root/etc/cont-init.d/60-create-user b/mate/root/etc/cont-init.d/60-create-user
index 91004d5..ec7405b 100644
--- a/mate/root/etc/cont-init.d/60-create-user
+++ b/mate/root/etc/cont-init.d/60-create-user
@@ -14,12 +14,15 @@ chmod 755 /etc/xrdp/sesman.ini
 
 touch /home/${USERNAME}/lock.file
 
-# default file copies first run
+# create .config dir
 [[ ! -d /home/${USERNAME}/.config ]] && \
-	mkdir -p /home/${USERNAME}/.config && \
-	cp /defaults/startwm.sh /home/${USERNAME}/startwm.sh
-    chmod +x /home/${USERNAME}/startwm.sh
-    chown -R ${USERNAME}:${USERAME} /home/${USERNAME}
+	mkdir -p /home/${USERNAME}/.config
+
+
+cp /defaults/startwm.sh /home/${USERNAME}/startwm.sh
+chmod +x /home/${USERNAME}/startwm.sh
+chown -R ${USERNAME}:${USERAME} /home/${USERNAME}
+
 # permissions
 PERM=$(stat -c '%U' /home/${USERNAME}/.config)
 [[ "${PERM}" != "${USERNAME}" ]] && \
diff --git a/xfce/root/etc/cont-init.d/60-create-user b/xfce/root/etc/cont-init.d/60-create-user
index 91004d5..ec7405b 100644
--- a/xfce/root/etc/cont-init.d/60-create-user
+++ b/xfce/root/etc/cont-init.d/60-create-user
@@ -14,12 +14,15 @@ chmod 755 /etc/xrdp/sesman.ini
 
 touch /home/${USERNAME}/lock.file
 
-# default file copies first run
+# create .config dir
 [[ ! -d /home/${USERNAME}/.config ]] && \
-	mkdir -p /home/${USERNAME}/.config && \
-	cp /defaults/startwm.sh /home/${USERNAME}/startwm.sh
-    chmod +x /home/${USERNAME}/startwm.sh
-    chown -R ${USERNAME}:${USERAME} /home/${USERNAME}
+	mkdir -p /home/${USERNAME}/.config
+
+
+cp /defaults/startwm.sh /home/${USERNAME}/startwm.sh
+chmod +x /home/${USERNAME}/startwm.sh
+chown -R ${USERNAME}:${USERAME} /home/${USERNAME}
+
 # permissions
 PERM=$(stat -c '%U' /home/${USERNAME}/.config)
 [[ "${PERM}" != "${USERNAME}" ]] && \