update submodules, remove bsd shims, fix bugs

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 2d244b1c5e8a926ea0d6cbc5d104b24a29de54ef..81ba565867a71709126053e309434cfbbe6acb5a 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -4,7 +4,7 @@
 
 # test
 if [ "$1" = "test" ]; then
-       mkdir() { echo -- "$*"; }
+       mkdir() { echo -- "$@"; }
        alias ln="echo ln"
        alias rm="echo rm"
        alias cap_mkdb="echo cap_mkdb"
@@ -17,18 +17,17 @@ 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 -
 
-# accomodate multiple userlands
-fex='-perm -ugo=x'
-lnargs=-sfnv
+# 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;;
-       # android busybox find doesn't have -executable
-       android)                fex=-executable;;
 esac
 
 l() {
@@ -46,29 +45,20 @@ 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 $fex -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
-cd "$PWD/xorg"
-for y in icons themes; do
-       find $y -type d -mindepth 2 -maxdepth 2 | while read -r x; do
-               l "$HOME/.$y/`basename "$x"`" "$PWD/$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
-cd -
 find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/share/fonts/`basename "$x"`"
 done
 
-cd ~
-if [ "$OSTYPE" = "freebsd" ]; then
-       # FreeBSD tries `_secure_path' on `.login_conf' before reading the
-       # database, so it needs to be compiled and unlinked for it to actually
-       # take effect.
-       rm .login_conf.db
-       cap_mkdb .login_conf
-fi
-unlink .login_conf
 # run .zprofile to set up tmp
-zsh .zprofile
-cd -
+zsh ~/.zprofile