X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/0b6d64fdda18194db1c59e871b0c3e6ca54aea76..HEAD:/install.sh?ds=sidebyside

diff --git a/install.sh b/install.sh
index 5232abf..073f4be 100755
--- a/install.sh
+++ b/install.sh
@@ -67,7 +67,7 @@ find . "$share" "$etc" \
      "$LOCAL/bin" "$share/fonts" "$share/themes" "$share/icons" \
      "$etc/gnupg" .ssh .termux \
      -xdev -mindepth 1 -maxdepth 1 -type l -exec sh -c '
-       r="$(realpath "{}")"
+       r="$(realpath "{}" 2>/dev/null)"
        [ "${r#'"$SRC"'/}" != "$r" ] &&
          '"$([ "${DOTFILES_TEST+x}" = x ] && echo 'echo +++ ')"'unlink "{}"' \;
 
@@ -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
@@ -98,7 +98,7 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do
             done
             ;;
         fonts)
-            find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do
+            find "$y" -mindepth 2 -maxdepth 2 -type d | while read -r x; do
                 command -v mkfontscale >$devnull 2>&1 && mkfontscale "$x"
                 command -v mkfontdir >$devnull 2>&1 && mkfontdir "$x"
                 [ "$(head -1 "$x/fonts.scale" >$devnull 2>&1)" = 0 ] &&
@@ -162,7 +162,23 @@ fi
 if [ $(uname -o) = 'Android' ]; then
     mkdir -p "$DEST/.termux"
     find termux -mindepth 1 -maxdepth 1 | while read -r x; do l ".$x"; done
-    l '.termux/font.ttf' "gui/fonts/Dina-ttf/Dina.ttf"
+    l '.termux/font.ttf' "gui/fonts/Dina/Dina-ttf/Dina.ttf"
+
+    # set up links for termux-setup-storage
+    termux_storage_link() {
+        d="$HOME/$1"
+        [ -L "$d" -o \! -e "$d" ] && ln $lnargs "$2" "$d" ||
+          echo "!!! File exists and is not a link: $d"
+    }
+    termux_storage_link dls       storage/downloads
+    termux_storage_link docs      storage/shared/Documents
+    termux_storage_link music     storage/music
+    termux_storage_link pics      storage/pictures
+    termux_storage_link vids      storage/movies
+    # not xdg but convenient
+    termux_storage_link dcim      storage/dcim
+    # NOTE: required for termux share target
+    termux_storage_link downloads storage/downloads
 fi
 
 cd "$DEST" >$devnull
@@ -170,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"