From: sev <git@sev.monster>
Date: Wed, 21 Aug 2024 09:05:16 +0000 (-0500)
Subject: install.sh: suppress more link errors, fix l() msg
X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/commitdiff_plain/f7d57eb9130b46191cc20ff4e35f74d1fc9f187b?ds=sidebyside

install.sh: suppress more link errors, fix l() msg
---

diff --git a/install.sh b/install.sh
index c320866..073f4be 100755
--- 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" ||
-      echo "!!! File exists and is not a link: $1"
+      echo "!!! File exists and is not a link: $d"
 }
 
 # 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() {
-    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"