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 {
+. $etc/user-dirs.dirs
+fixup_xdg_home() {
if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1")" = "$(realpath "$HOME")" ]; then
return;
fi
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
+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"