zprofile: quietly check for running ssh agent

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 2da25899e2a58a11f0aa73715f57eb411c7501ed..89d64d7975377dccf87c10344ee93d9a9217e61b 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,87 +1,167 @@
 #!/bin/sh
 
 #!/bin/sh
 

-#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
+# install location and source files
+: ${DEST:=$(realpath "$HOME")}
+: ${SRC:=$(dirname "$(realpath "$0")")}
+
+# confirm XDG vars we care about are set up
+: ${LOCAL:=.local} # NOTE: needed for bin, which has no xdg var
+: ${XDG_DATA_HOME:=$DEST/$LOCAL/share}
+: ${XDG_CONFIG_HOME:=$DEST/.config}
+: ${XDG_STATE_HOME:=$DEST/$LOCAL/state}
+: ${XDG_CACHE_HOME:=$DEST/.cache}
+
+# these are the vars we actually use
+share="${XDG_DATA_HOME#$DEST/}"
+etc="${XDG_CONFIG_HOME#$DEST/}"
+state="${XDG_STATE_HOME#$DEST/}"
+cache="${XDG_CACHE_HOME#$DEST/}"

 
 # test
 devnull=/dev/null
 if [ "$1" = "test" ]; then
 
 # test
 devnull=/dev/null
 if [ "$1" = "test" ]; then

-       echo "Running test -- no changes will be applied"
-       devnull=/dev/stdout
-       _cd() {
-               cd $*;
-               echo "  cd $*";
-               echo "\$PWD=$PWD";
-       }
-       alias cd="_cd"
-       alias mkdir="echo mkdir"
-       alias ln="echo ln"
-       alias rm="echo rm"
-       alias sh="echo sh"
+    echo "Running test -- no changes will be applied"
+    devnull=/dev/stdout
+    _cd() {
+        echo "-- cd $* --> $PWD";
+        cd $*;
+    }
+    alias cd="_cd"
+    alias mkdir="echo -- mkdir"
+    alias rmdir="echo -- rmdir"
+    alias ln="echo -- ln"
+    alias rm="echo -- rm"
+    alias mv="echo -- mv"
+    alias sh="echo -- sh"

 fi
 
 fi
 

-# create preferred folder structure
-cd ~
-mkdir -p bin etc share share/fonts .urxvt/ext \
-         .icons .themes .gnupg .ssh .termux >$devnull 2>&1
-mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
-cd - >$devnull
-

 # ensure ostype
 # ensure ostype

+# NOTE: copied from .zshenv

 if [ -z "$OSTYPE" ]; then
 if [ -z "$OSTYPE" ]; then

-       OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
+    OSTYPE=$(uname -s | tr '[:upper:]' '[:lower:]')

 fi
 
 # accomodate multiple userlands
 fi
 
 # accomodate multiple userlands

+# XXX: assuming GNU by default
+# TODO: test for GNU, fallback to POSIX instead (no -n)

 lnargs=-sfnv
 case "$OSTYPE" in
 lnargs=-sfnv
 case "$OSTYPE" in

-       freebsd*)               lnargs=-sFhv;;
-       netbsd|openbsd*)        lnargs=-sfhv;;
+    freebsd*)       lnargs=-sFhv;;
+    netbsd|openbsd*)    lnargs=-sfhv;;

 esac
 
 esac
 

+# save pwd
+old_pwd="$PWD"
+
+cd "$DEST"
+
+# create preferred folder structure
+mkdir -pm 760 "$share" "$etc" "$state" "$cache"
+ln $lnargs "$DEST/$etc" "$LOCAL/etc"
+mkdir -p "$LOCAL/bin" "$share/fonts" "$share/themes" "$share/icons"
+
+# clean out old links
+# TODO: doesn't remove dead links if realpath fails; this happens if the link
+#       target doesn't exist under busybox
+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#'"$SRC"'/}" != "$r" ] &&
+         '"$([ "$1" = test ] && echo 'echo +++ ')"'unlink "{}"' \;
+
+cd "$SRC" >$devnull
+

 l() {
 l() {

-       # TODO: use install?
-       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$PWD/$x}" "$1" || \
-               echo "!!! File exists and is not a link: $1"
+    # 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"

 }
 
 }
 

-# link files
-find base -mindepth 1 -maxdepth 1 | while read -r x; do
-       l "$HOME/`basename "$x"`"
-done
-find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
-       l "$HOME/$x"
-done
-find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
-       l "$HOME/share/fonts/`basename "$x"`"
-done
-find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
-       l "$HOME/etc/`basename "$x"`"
-done
-find urxvt-ext -mindepth 1 -maxdepth 2 -type f -perm -111 | while read -r x; do
-       l "$HOME/.urxvt/ext/`basename $x`"
-done
-find xorg/icons -mindepth 1 -maxdepth 2 -type d | while read -r x; do
-       if [ -e "$x/index.theme" ]; then
-               d="$HOME/.icons/`basename "$x"`"
-               l $d
-               which gtk-update-icon-cache >/dev/null 2>&1 && gtk-update-icon-cache -qtf $d
-               unset d
-       fi
-done
-find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do
-       l "$HOME/.themes/`basename "$x"`"
-done
-find gpg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do
-       l "$HOME/.gnupg/`basename "$x"`"
+# generic links
+find base  -mindepth 1 -maxdepth 1 | while read -r x; do l "${x#base/}"; done
+find bin   -mindepth 1 -maxdepth 1 | while read -r x; do l "$LOCAL/$x"; done
+find share -mindepth 1 -maxdepth 1 | while read -r x; do l "$share${x#share}"; done
+find etc   -mindepth 1 -maxdepth 1 | while read -r x; do l "$etc${x#etc}"; done
+
+# xorg/wayland resources
+find gui -mindepth 1 -maxdepth 1 | while read -r y; do
+    case "${y#gui/}" in
+        icons|themes)
+            find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do
+                [ ! -e "$x/index.theme" ] && continue
+                command -v gtk-update-icon-cache >$devnull 2>&1 &&
+                  gtk-update-icon-cache -f "$x"
+                l "$share${y#gui}/$(basename "$x")"
+            done
+            ;;
+        fonts)
+            find "$y" -mindepth 1 -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 ] &&
+                  rm "$x/fonts.scale"
+                [ "$(head -1 "$x/fonts.dir" >$devnull 2>&1)" = 0 ] &&
+                  rm "$x/fonts.dir"
+                l "$share${y#gui}/$(basename "$x")"
+            done
+            ;;
+        *)
+            find "$y" -mindepth 1 -maxdepth 1 | while read -r x; do
+                l "$share${x#gui}"
+            done
+            ;;
+    esac

 done
 done

-if which gpg >/dev/null 2>&1; then
-       find gpg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
-               gpg --import "$x"
-       done
+
+# gpg
+if command -v gpg >$devnull 2>&1; then
+    mkdir -pm 700 "$DEST/$etc/gnupg"
+    find gnupg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do
+        l "$etc/$x"
+    done
+    find gnupg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
+        gpg --import "$x"
+    done

 fi
 fi

-for y in ssh termux; do
-       find $y -mindepth 1 -maxdepth 1 | while read -r x; do
-               l "$HOME/.$y/`basename "$x"`"
-       done
-done
-x='fonts/Dina-ttf/Dina.ttf' l "$HOME/.termux/font.ttf"
+
+# ssh
+if command -v ssh >$devnull 2>&1; then
+    mkdir -pm 700 "$DEST/.ssh"
+    find ssh -mindepth 1 -maxdepth 1 | while read -r x; do
+      l ".$x"; done
+fi
+
+# termux, assume it if android
+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"
+fi
+
+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
+        return;
+    fi
+    mkdir -p "$1"
+    if [ $? -eq 0 -a -n "$2" -a -d "$2" ]; then
+        mv "$2"/* $1
+        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
+
+cd "$old_pwd"