update submodules, remove bsd shims, fix bugs

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 05715dbb493782be28eddd5206e0ff623e353bf1..81ba565867a71709126053e309434cfbbe6acb5a 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,45 +1,64 @@
 #!/bin/sh
 
-if [ 0 -eq 1 ]; then
-       alias mkdir="echo mkdir"
+#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
 
-#fix permissions from git (TODO: should probably move this to git hook)
-chmod go= base/.zshenv base/.Xresources
-
-#create preferred folder structure
-cd "$HOME"
-mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
-mkdir -m 700 tmp tmp/vim > /dev/null 2>&1
+# 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 -sFhvw "${2:-$x}" "$1"
+       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
 }
 
-find "$PWD/base" -depth 1 | while read -r x; do
+# link files
+find "$PWD/base" -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done
-find bin share -depth 1 | while read -r x; do
+find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/$x" "$PWD/$x"
 done
-find "$PWD/xdg" -depth 1 | while read -r x; do
-       l "${XDG_CONFIG_HOME:-$HOME/.config}/`basename "$x"`"
+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 -ugo=x -mindepth 1 -maxdepth 2 | while read -r x; do
+find "$PWD/urxvt-ext" -type f -perm -111 -mindepth 1 -maxdepth 2 | while read -r x; do
        l "$HOME/.urxvt/ext/`basename $x`"
 done
-touch "$HOME/.hushlogin"
-
-#FreeBSD tries `_secure_path' on `.login_conf' before reaading the database,
-#so it needs to be compiled and unlinked for it to actually take effect.
-cd "$HOME"
-rm .login_conf.db
-cap_mkdb .login_conf
-unlink .login_conf
-cd -
+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
+
+# run .zprofile to set up tmp
+zsh ~/.zprofile