Moved creation of user folders into startwm script

tibor309 · Jul 25, 2024 · 5f9cd0e · 5f9cd0e
1 parent 8baf2d4
commit 5f9cd0e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 25 deletions.
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
@@ -15,15 +15,23 @@ if [ ! -f $HOME/.config/kscreenlockerrc ]; then
   kwriteconfig5 --file $HOME/.config/kscreenlockerrc --group Daemon --key Autolock false
 fi
 
-# set folder locations
-xdg-user-dirs-update --set DESKTOP /config/Desktop
-xdg-user-dirs-update --set DOCUMENTS /config/Documents
-xdg-user-dirs-update --set DOWNLOAD /config/Downloads
-xdg-user-dirs-update --set MUSIC /config/Music
-xdg-user-dirs-update --set PICTURES /config/Pictures
-xdg-user-dirs-update --set PUBLICSHARE /config/Public
-xdg-user-dirs-update --set TEMPLATES /config/Templates
-xdg-user-dirs-update --set VIDEOS /config/Videos
+# create user folders
+if [ ! -f "$HOME/.firstsetup" ]; then
+    mkdir -p $HOME/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos}
+    chown abc:abc $HOME/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos}
+
+    xdg-user-dirs-update --set DESKTOP $HOME/Desktop
+    xdg-user-dirs-update --set DOCUMENTS $HOME/Documents
+    xdg-user-dirs-update --set DOWNLOAD $HOME/Downloads
+    xdg-user-dirs-update --set MUSIC $HOME/Music
+    xdg-user-dirs-update --set PICTURES $HOME/Pictures
+    xdg-user-dirs-update --set PUBLICSHARE $HOME/Public
+    xdg-user-dirs-update --set TEMPLATES $HOME/Templates
+    xdg-user-dirs-update --set VIDEOS $HOME/Videos
+
+    touch $HOME/.firstsetup
+fi
+
 
 # launch de
 /usr/bin/dbus-launch /usr/bin/startplasma-x11 > /dev/null 2>&1
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-setupkde b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-setupkde
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setupkde/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-setupkde/dependencies.d/init-config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setupkde/run b/root/etc/s6-overlay/s6-rc.d/init-setupkde/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setupkde/type b/root/etc/s6-overlay/s6-rc.d/init-setupkde/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setupkde/up b/root/etc/s6-overlay/s6-rc.d/init-setupkde/up
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setupkde b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setupkde