zsh: fix aliases

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 5623d62d3a3e0f6f4117287444d915db86e66fee..05d5554e3e96945d127d37cf79bd5393de71780e 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,45 +1,78 @@
 #!/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")")}
 
 : ${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
     echo "Running test -- no changes will be applied"
     devnull=/dev/stdout
     _cd() {
 # test
 devnull=/dev/null
 if [ "$1" = "test" ]; then
     echo "Running test -- no changes will be applied"
     devnull=/dev/stdout
     _cd() {

+        echo "-- cd $* --> $PWD";

         cd $*;
         cd $*;

-        echo "  cd $*";
-        echo "\$PWD=$PWD";

     }
     alias cd="_cd"
     alias mkdir="echo -- mkdir"
     }
     alias cd="_cd"
     alias mkdir="echo -- mkdir"

+    alias rmdir="echo -- rmdir"

     alias ln="echo -- ln"
     alias rm="echo -- rm"
     alias ln="echo -- ln"
     alias rm="echo -- rm"

+    alias mv="echo -- mv"

     alias sh="echo -- sh"
 fi
 
     alias sh="echo -- sh"
 fi
 

-# create preferred folder structure
-cd $DEST
-mkdir -p bin etc share/fonts share/themes share/icons >$devnull 2>&1
-which vim >$devnull 2>&1 && mkdir -pm 700 var/tmp/vim >$devnull 2>&1
-cd $SRC >$devnull
-

 # ensure ostype
 # ensure ostype

+# NOTE: copied from .zshenv

 if [ -z "$OSTYPE" ]; then
     OSTYPE=$(uname -s | tr '[:upper:]' '[:lower:]')
 fi
 
 # accomodate multiple userlands
 if [ -z "$OSTYPE" ]; then
     OSTYPE=$(uname -s | tr '[:upper:]' '[:lower:]')
 fi
 
 # accomodate multiple userlands

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

 lnargs=-sfnv
 case "$OSTYPE" in
     freebsd*)       lnargs=-sFhv;;
     netbsd|openbsd*)    lnargs=-sfhv;;
 esac
 
 lnargs=-sfnv
 case "$OSTYPE" in
     freebsd*)       lnargs=-sFhv;;
     netbsd|openbsd*)    lnargs=-sfhv;;
 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() {
     # TODO: use install?
     d="$DEST/${1:-$x}"
 l() {
     # TODO: use install?
     d="$DEST/${1:-$x}"


@@ -48,8 +81,10 @@ l() {
 }
 
 # generic links
 }
 
 # generic links

-find base -mindepth 1 -maxdepth 1 | while read -r x; do l "${x#base/}"; done
-find bin etc share -mindepth 1 -maxdepth 1 | while read -r x; do l; done
+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
 
 # xorg/wayland resources
 find gui -mindepth 1 -maxdepth 1 | while read -r y; do


@@ -57,35 +92,35 @@ find gui -mindepth 1 -maxdepth 1 | while read -r y; do
         icons|themes)
             find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do
                 [ ! -e "$x/index.theme" ] && continue
         icons|themes)
             find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do
                 [ ! -e "$x/index.theme" ] && continue

-                which gtk-update-icon-cache >$devnull 2>&1 &&
+                command -v gtk-update-icon-cache >$devnull 2>&1 &&

                   gtk-update-icon-cache -f "$x"
                   gtk-update-icon-cache -f "$x"

-                l "share${y#gui}/$(basename "$x")"
+                l "$share${y#gui}/$(basename "$x")"

             done
             ;;
         fonts)
             find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do
             done
             ;;
         fonts)
             find "$y" -mindepth 1 -maxdepth 2 -type d | while read -r x; do

-                which mkfontscale >$devnull 2>&1 && mkfontscale "$x"
-                which mkfontdir >$devnull 2>&1 && mkfontdir "$x"
+                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"
                 [ "$(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")"
+                l "$share${y#gui}/$(basename "$x")"

             done
             ;;
         *)
             find "$y" -mindepth 1 -maxdepth 1 | while read -r x; do
             done
             ;;
         *)
             find "$y" -mindepth 1 -maxdepth 1 | while read -r x; do

-                l "share${x#gui}"
+                l "$share${x#gui}"

             done
             ;;
     esac
 done
 
 # gpg
             done
             ;;
     esac
 done
 
 # gpg

-if which gpg >$devnull 2>&1; then
-    mkdir -p "$DEST/etc/gnupg"
+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
     find gnupg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do

-        l "etc/$x"
+        l "$etc/$x"

     done
     find gnupg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
         gpg --import "$x"
     done
     find gnupg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
         gpg --import "$x"


@@ -93,15 +128,40 @@ if which gpg >$devnull 2>&1; then
 fi
 
 # ssh
 fi
 
 # ssh

-find ssh -mindepth 1 -maxdepth 1 | while read -r x; do
-  l ".$x"; done
+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"
 
 # 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" 'share/fonts/Dina-ttf/Dina.ttf'
+    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
 
 fi
 

-# vim: sts=4 sw=4 et
+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 {
+    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"