zshrc: add more git aliases, dotfiles update alias

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 05d5554e3e96945d127d37cf79bd5393de71780e..89d64d7975377dccf87c10344ee93d9a9217e61b 100755 (executable)
--- 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
 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
     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
 }
         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"
 
 cd "$old_pwd"