fix gnu find depth warning, update comments

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 81ba565867a71709126053e309434cfbbe6acb5a..1316d74b559be8f45b4e739214e10452ebfb384f 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -3,19 +3,27 @@
 #NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
 
 # test
+devnull=/dev/null
 if [ "$1" = "test" ]; then
-       mkdir() { echo -- "$@"; }
+       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 cap_mkdb="echo cap_mkdb"
-       alias unlink="echo unlink"
+       alias sh="echo sh"
 fi
 
 # create preferred folder structure
 cd ~
-mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes > /dev/null 2>&1
-mkdir -pm 700 var/tmp var/tmp/vim > /dev/null 2>&1
-cd -
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes >$devnull 2>&1
+mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
+cd - >$devnull
 
 # ensure ostype
 if [ -z "$OSTYPE" ]; then
@@ -25,40 +33,56 @@ fi
 # accomodate multiple userlands
 lnargs=-sfnv
 case "$OSTYPE" in
-       # TODO: make links safer for systems without -Fw
-       freebsd*)               lnargs=-sFhvw;;
+       freebsd*)               lnargs=-sFhv;;
        netbsd|openbsd*)        lnargs=-sfhv;;
 esac
 
 l() {
        # TODO: use install?
-       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
+       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$PWD/$x}" "$1" || \
+               echo "!!! File exists and is not a link: $1"
 }
 
 # link files
-find "$PWD/base" -mindepth 1 -maxdepth 1 | while read -r x; do
+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" "$PWD/$x"
+       l "$HOME/$x"
 done
-find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
+find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/etc/`basename "$x"`"
 done
-find "$PWD/urxvt-ext" -type f -perm -111 -mindepth 1 -maxdepth 2 | while read -r x; do
+find urxvt-ext -mindepth 1 -maxdepth 2 -type f -perm -111 | while read -r x; do
        l "$HOME/.urxvt/ext/`basename $x`"
 done
-find "$PWD/xorg/icons" -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+find xorg/icons -mindepth 1 -maxdepth 2 -type d | while read -r x; do
        if [ -e "$x/index.theme" ]; then
-               l "$HOME/.icons/`basename "$x"`"
+               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 "$PWD/xorg/themes" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do
        l "$HOME/.themes/`basename "$x"`"
 done
-find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
        l "$HOME/share/fonts/`basename "$x"`"
 done
+#XXX: potential bug with newlines in profile name (if ff even takes it)
+#XXX: only uses first profile folder, read from profiles.ini
+ffdir="`find "$HOME/.mozilla/firefox" -mindepth 1 -maxdepth 1 -type d | head -1 2>$devnull`"
+if [ -d "$ffdir" ]; then
+       find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
+               l "$ffdir/`basename "$x"`"
+       done
+       cd "$ffdir"
+       echo "Updating user.js"
+       sh ./user-js-updater.sh
+       cd - >$devnull
+fi
 
 # run .zprofile to set up tmp
+# .zprofile also sources .zshenv for compatibility
 zsh ~/.zprofile