fix ostype

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index d2585a8c38abf1a121d69618a70716ff3a2e77bb..6e772915f673de59ec93d7c1ae3d223d555cf0b5 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -2,27 +2,31 @@
 
 # test
 if [ 0 -eq 1 ]; then
 
 # test
 if [ 0 -eq 1 ]; then

-       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
 
        alias ln="echo ln"
        alias rm="echo rm"
        alias cap_mkdb="echo cap_mkdb"
        alias unlink="echo unlink"
 fi
 

-# accomodate linuxisms
+# create preferred folder structure
+cd ~
+mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
+mkdir -m 700 var/tmp var/tmp/vim > /dev/null 2>&1
+cd -
+
+# accomodate multiple userlands

 fex='-perm -ugo=x'
 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
+                               if [ -z "$ANDROID_ROOT" ]; then
+                                       fex=-executable
+                               fi;;

 esac
 
 l() {
 esac
 
 l() {


@@ -30,22 +34,14 @@ l() {
        [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
 }
 
        [ -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
 # 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
        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
        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
        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


@@ -53,7 +49,7 @@ find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
 done
 
 cd ~
 done
 
 cd ~

-if [ -n "$bsd" ]; then
+if [ "$OSTYPE" = "freebsd" ]; then

        touch .hushlogin
 
        # FreeBSD tries `_secure_path' on `.login_conf' before reading the
        touch .hushlogin
 
        # FreeBSD tries `_secure_path' on `.login_conf' before reading the


@@ -62,8 +58,8 @@ if [ -n "$bsd" ]; then
        rm .login_conf.db
        cap_mkdb .login_conf
 
        rm .login_conf.db
        cap_mkdb .login_conf
 

-       # run .zprofile to set up tmp
-       /usr/local/bin/zsh .zprofile

 fi
 unlink .login_conf
 fi
 unlink .login_conf

+# run .zprofile to set up tmp
+zsh .zprofile

 cd -
 cd -