fix user-dirs, add support to install.sh

user-dirs.conf added, so that our user-dirs.dirs won't get overwritten.
install.sh will now ensure user dirs and move files from default dirs.

diff --git a/etc/user-dirs.conf b/etc/user-dirs.conf
new file mode 100644 (file)
index 0000000..ddc065d
--- /dev/null
+++ b/etc/user-dirs.conf
@@ -0,0 +1,2 @@
+enabled=false
+filename_encoding=UTF-8

diff --git a/install.sh b/install.sh
index 9f669d1a61e29981682f8e5fc141fce1a158518b..05d5554e3e96945d127d37cf79bd5393de71780e 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -23,13 +23,15 @@ if [ "$1" = "test" ]; then
     echo "Running test -- no changes will be applied"
     devnull=/dev/stdout
     _cd() {
-        cd $*;
         echo "-- cd $* --> $PWD";
+        cd $*;
     }
     alias cd="_cd"
     alias mkdir="echo -- mkdir"
+    alias rmdir="echo -- rmdir"
     alias ln="echo -- ln"
     alias rm="echo -- rm"
+    alias mv="echo -- mv"
     alias sh="echo -- sh"
 fi
 
@@ -48,6 +50,9 @@ case "$OSTYPE" in
     netbsd|openbsd*)    lnargs=-sfhv;;
 esac
 
+# save pwd
+old_pwd="$PWD"
+
 cd "$DEST"
 
 # create preferred folder structure
@@ -135,3 +140,28 @@ if [ $(uname -o) = 'Android' ]; then
     find termux -mindepth 1 -maxdepth 1 | while read -r x; do l ".$x"; done
     l '.termux/font.ttf' "gui/fonts/Dina-ttf/Dina.ttf"
 fi
+
+cd "$DEST" >$devnull
+
+# ensure xdg user dirs, and move old to new while we're at it
+source $etc/user-dirs.dirs
+function fixup_xdg_home {
+    if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1")" = "$(realpath "$HOME")" ]; then
+        return;
+    fi
+    mkdir -p "$1"
+    if [ $? -eq 0 -a -n "$2" -a -d "$2" ]; then
+        mv "$2"/* $1
+        rmdir "$2"
+    fi
+}
+fixup_xdg_home $XDG_DESKTOP_DIR     Desktop
+fixup_xdg_home $XDG_DOWNLOAD_DIR    Downloads
+fixup_xdg_home $XDG_TEMPLATES_DIR
+fixup_xdg_home $XDG_PUBLICSHARE_DIR Public
+fixup_xdg_home $XDG_DOCUMENTS_DIR   Documents
+fixup_xdg_home $XDG_MUSIC_DIR       Music
+fixup_xdg_home $XDG_PICTURES_DIR    Pictures
+fixup_xdg_home $XDG_VIDEOS_DIR      Videos
+
+cd "$old_pwd"