Merge branch 'master' of home:git/dotfiles

extrapolated some bsd-only stuff

diff --cc base/.xinitrc
index cd5b9cc9d0e9c31166a96d35759623bda5612baf,36171bfe26cb34209f5d224d3f6685c95c2cdce8..36171bfe26cb34209f5d224d3f6685c95c2cdce8
mode 100644,100755..100644
--- 1/base/.xinitrc
--- 2/base/.xinitrc
+++ b/base/.xinitrc

diff --cc base/.zshenv
Simple merge

diff --cc install.sh
index ae7c6886c00d93dd1cd3231fae95b2a932e4acde,d2585a8c38abf1a121d69618a70716ff3a2e77bb..5f2c3d4f0f2052693555da277d1e3d5ec06784d2
--- 1/install.sh
--- 2/install.sh
+++ b/install.sh
@@@ -1,31 -1,28 +1,32 @@@
  #!/bin/sh
  
+ # test
  if [ 0 -eq 1 ]; then
-       mkdir() { echo "$*"; }
 -      alias mkdir="echo mkdir"
++      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
 -# accomodate linuxisms
++# create preferred folder structure
 +cd ~
 +mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
- mkdir -m 700 tmp tmp/vim > /dev/null 2>&1
++mkdir -m 700 var/tmp var/tmp/vim > /dev/null 2>&1
 +cd -
 +
- #accomodate linuxisms
++# accomodate multiple userlands
  fex='-perm -ugo=x'
 -# TODO: should probably do this better
 -case "`uname`" in
 -      *BSD*)  lnargs=-sFhvw
 -              d1='-depth 1'
 -              bsd=yes;;
 -      *)      lnargs=-sfnv
 -              d1='-mindepth 1 -maxdepth 1'
 -              # android busybox find doesn't have -execute
 -              # and its sh doesn't set OSTYPE :DD
 -              if [ -z "$ANDROID_ROOT" ]; then
 -                      fex=-executable
 -              fi;;
 +case "$OSTYPE" in
 +      # TODO: make links safer for systems without -Fw
 +      freebsd)        lnargs=-sFhvw;;
 +      netbsd|openbsd) lnargs=-sfhv;;
 +      *)              lnargs=-sfnv
-                       #android busybox find doesn't have -executable
-                       #and its sh doesn't set OSTYPE :DD
++                      # android busybox find doesn't have -executable
++                      # and its sh doesn't set OSTYPE :DD
 +                      if [ -z "$ANDROID_ROOT" ]; then
 +                              fex=-executable
 +                      fi;;
  esac
  
  l() {
@@@ -33,13 -30,22 +34,14 @@@
        [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
  }
  
 -
 -# create preferred folder structure
 -cd ~
 -mkdir -p bin etc share var/run var/log urxvt/ext > /dev/null 2>&1
 -mkdir -m 700 var/tmp var/tmp/vim > /dev/null 2>&1
 -[ -z "$bsd" ] && mkdir -m 700 tmp > /dev/null 2>&1
 -cd -
 -
+ # link files
 -find "$PWD/base" $d1 | while read -r x; do
 +find "$PWD/base" -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/`basename "$x"`"
  done
 -find bin share $d1 | 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" $d1 | while read -r x; do
 +find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
        l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"
  done
  find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
@@@ -47,13 -53,17 +49,17 @@@
  done
  
  cd ~
 -if [ -n "$bsd" ]; then
 +if [ "$OSTYPE" = "freebsd" ]; then
        touch .hushlogin
  
-       #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.
+       # 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
 -      # run .zprofile to set up tmp
 -      /usr/local/bin/zsh .zprofile
+ 
  fi
  unlink .login_conf
++# run .zprofile to set up tmp
++zsh .zprofile
  cd -