From 3d37fc5fbb0705283a4089195ac521c27e92f689 Mon Sep 17 00:00:00 2001
From: hayao <shun819.mail@gmail.com>
Date: Fri, 28 Feb 2020 22:00:12 +0900
Subject: [PATCH] [fix] : Changed how user directories are created.

---
 airootfs/etc/skel/.setup.sh                | 35 ++++++++++++++++++++++++++++++
 airootfs/usr/share/calamares/final-process |  4 +++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 airootfs/etc/skel/.setup.sh

diff --git a/airootfs/etc/skel/.setup.sh b/airootfs/etc/skel/.setup.sh
new file mode 100644
index 00000000..8f2160c7
--- /dev/null
+++ b/airootfs/etc/skel/.setup.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# Creating a xdg
+LANG=C
+xdg-user-dirs-update
+
+HOME="~"
+if [[ -f ${HOME}/.config/user-dirs.dirs ]]; then
+    source ${HOME}/.config/user-dirs.dirs
+
+    # Add pictures to bookmark
+    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -n "${XDG_PICTURES_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
+
+    # Add videos to bookmark
+    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -n "${XDG_VIDEOS_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
+
+    # Add music to bookmark
+    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -n "${XDG_VIDEOS_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
+
+    # Add downloads to bookmark
+    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -n "${XDG_DOWNLOAD_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
+
+    # Add documents to bookmark
+    echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -n "${XDG_DOCUMENTS_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
+    echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
+fi
\ No newline at end of file
diff --git a/airootfs/usr/share/calamares/final-process b/airootfs/usr/share/calamares/final-process
index 3173f0e9..7f285324 100644
--- a/airootfs/usr/share/calamares/final-process
+++ b/airootfs/usr/share/calamares/final-process
@@ -28,6 +28,7 @@ remove /root/.automated_script.sh
 remove /etc/mkinitcpio-archiso.conf
 remove /etc/initcpio
 
+<<DISABLED
 if [[ -f /home/${user}/.config/user-dirs.dirs ]]; then
     HOME="/home/${user}"
     source ${HOME}/.config/user-dirs.dirs
@@ -56,4 +57,5 @@ if [[ -f /home/${user}/.config/user-dirs.dirs ]]; then
     echo -n "file://" >> ${HOME}/.config/gtk-3.0/bookmarks
     echo -n "${XDG_DOCUMENTS_DIR}" >> ${HOME}/.config/gtk-3.0/bookmarks
     echo -ne "\n" >> ${HOME}/.config/gtk-3.0/bookmarks
-fi
\ No newline at end of file
+fi
+DISABLED
\ No newline at end of file
-- 
2.11.0