From c96892abd973956a59349b2b71e9998c391e3ec1 Mon Sep 17 00:00:00 2001
From: Devin Dice <bpapilot@gmail.com>
Date: Sun, 15 Jan 2023 13:04:01 -0500
Subject: [PATCH] Fixing issues

---
 rootfs/etc/xdg/user-dirs.defaults | 2 +-
 rootfs/startup.sh                 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rootfs/etc/xdg/user-dirs.defaults b/rootfs/etc/xdg/user-dirs.defaults
index 9a54385..193abd5 100644
--- a/rootfs/etc/xdg/user-dirs.defaults
+++ b/rootfs/etc/xdg/user-dirs.defaults
@@ -5,7 +5,7 @@
 DESKTOP=Desktop
 DOWNLOAD=Downloads
 #TEMPLATES=Workspace
-PUBLICSHARE=Workspace/-Shared Files-
+PUBLICSHARE=Workspace/%FILE_SHARE%
 DOCUMENTS=Workspace
 #MUSIC="$HOME"
 #PICTURES="$HOME"
diff --git a/rootfs/startup.sh b/rootfs/startup.sh
index 9d8f292..a7e3f5c 100755
--- a/rootfs/startup.sh
+++ b/rootfs/startup.sh
@@ -27,6 +27,9 @@ fi
 
 if [ -n "$FILE_SHARE" ]; then
     FILE_SHARE=_Shared_Files_
+    sed -i "s/%FILE_SHARE%/_Shared_Files_/" /etc/xdg/user-dirs.defaults
+else
+    sed -i "s/%FILE_SHARE%/$FILE_SHARE/" /etc/xdg/user-dirs.defaults
 fi
 
 #sed -i "s#/usr/share/backgrounds.*#/usr/share/backgrounds/default.png\"/>#g" /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -37,6 +40,7 @@ if [ "$USER" != "root" ]; then
     echo "* enable custom user: $USER"
     #useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker -d /workspace/.home/$USER $USER
     useradd --create-home --shell /bin/bash --user-group --groups adm,sudo,docker $(if [ ! $PUID == "" ]; then echo "--uid $PUID"; fi) $(if [ ! $PGID == "" ]; then echo "--gid $PGID"; fi) $USER
+    chown -R $USER:$USER /home/$USER
 
     if [ -z "$PASSWORD" ]; then
         echo "  set default password to \"ubuntu\""