fix ostype

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index ae7c6886c00d93dd1cd3231fae95b2a932e4acde..6e772915f673de59ec93d7c1ae3d223d555cf0b5 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,31 +1,32 @@
 #!/bin/sh
 
 #!/bin/sh
 

+# test

 if [ 0 -eq 1 ]; then
 if [ 0 -eq 1 ]; then

-       mkdir() { echo "$*"; }
+       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
 

-#create preferred folder structure
+# create preferred folder structure

 cd ~
 mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
 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 -
 
 cd -
 

-#accomodate linuxisms
+# accomodate multiple userlands

 fex='-perm -ugo=x'
 case "$OSTYPE" in
        # TODO: make links safer for systems without -Fw
 fex='-perm -ugo=x'
 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;;
+       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() {


@@ -33,6 +34,7 @@ l() {
        [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
 }
 
        [ -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 "$PWD/base" -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done


@@ -50,10 +52,14 @@ cd ~
 if [ "$OSTYPE" = "freebsd" ]; then
        touch .hushlogin
 
 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
        rm .login_conf.db
        cap_mkdb .login_conf

+

 fi
 unlink .login_conf
 fi
 unlink .login_conf

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

 cd -
 cd -