X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/abc62f2c7358b51afbc539689d8b3126c6b016a1..4851c2318e2d5ae7274589bac10162214cb11c2a:/install.sh diff --git a/install.sh b/install.sh index 05d5554..89d64d7 100755 --- a/install.sh +++ b/install.sh @@ -144,8 +144,8 @@ 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 { +. $etc/user-dirs.dirs +fixup_xdg_home() { if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1")" = "$(realpath "$HOME")" ]; then return; fi @@ -155,13 +155,13 @@ function fixup_xdg_home { 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"