zshrc: bash-style reverse incremental search on ^R

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index c32086610c3cae8d17e7332a709bf9cdbdb7ec4b..073f4be0227a682d52842640cd0975cbd1f5b9ca 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -77,7 +77,7 @@ l() {
     # TODO: use install?
     d="$DEST/${1:-$x}"
     [ -L "$d" -o \! -e "$d" ] && ln $lnargs "$SRC/${2:-$x}" "$d" ||
     # TODO: use install?
     d="$DEST/${1:-$x}"
     [ -L "$d" -o \! -e "$d" ] && ln $lnargs "$SRC/${2:-$x}" "$d" ||

-      echo "!!! File exists and is not a link: $1"
+      echo "!!! File exists and is not a link: $d"

 }
 
 # generic links
 }
 
 # generic links


@@ -186,7 +186,8 @@ cd "$DEST" >$devnull
 # ensure xdg user dirs, and move old to new while we're at it
 . $etc/user-dirs.dirs
 fixup_xdg_home() {
 # ensure xdg user dirs, and move old to new while we're at it
 . $etc/user-dirs.dirs
 fixup_xdg_home() {

-    if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1")" = "$(realpath "$HOME")" ]; then
+    # NOTE: ignore if xdg var empty, not absolute, or set to $HOME (in spec!)
+    if [ -z "$1" -o "${1#/}" = "$1" -o "$(realpath "$1" 2>/dev/null)" = "$(realpath "$HOME")" ]; then

         return;
     fi
     mkdir -p "$1"
         return;
     fi
     mkdir -p "$1"