#!/bin/sh
-for x in `find "$PWD" -mindepth 1 -maxdepth 1 \! \( -name '.git' -name 'install.sh' \) -name '.*'`; do
- ln -vwis "$x" "$HOME/`basename $x`"
+
+#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
+
+# test
+if [ "$1" = "test" ]; then
+ mkdir() { echo -- "$@"; }
+ alias ln="echo ln"
+ alias rm="echo rm"
+ alias cap_mkdb="echo cap_mkdb"
+ alias unlink="echo unlink"
+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 -
+
+# ensure ostype
+if [ -z "$OSTYPE" ]; then
+ OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
+fi
+
+# accomodate multiple userlands
+lnargs=-sfnv
+case "$OSTYPE" in
+ # TODO: make links safer for systems without -Fw
+ freebsd*) lnargs=-sFhvw;;
+ netbsd|openbsd*) lnargs=-sfhv;;
+esac
+
+l() {
+ # TODO: use install?
+ [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
+}
+
+# link files
+find "$PWD/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"
+done
+find "$PWD/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
+ l "$HOME/.urxvt/ext/`basename $x`"
+done
+find "$PWD/xorg/icons" -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+ if [ -e "$x/index.theme" ]; then
+ l "$HOME/.icons/`basename "$x"`"
+ fi
+done
+find "$PWD/xorg/themes" -type d -mindepth 1 -maxdepth 1 | 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
+ l "$HOME/share/fonts/`basename "$x"`"
done
-ln -vwis "$PWD/i3-config" "$HOME/.config/i3/config"
-ln -vwis "$PWD/i3status-config" "$HOME/.config/i3status/config"
-#fix permissions
-chmod go= .zshenv .Xresources
+# run .zprofile to set up tmp
+zsh ~/.zprofile