fix ostype

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 05715dbb493782be28eddd5206e0ff623e353bf1..6e772915f673de59ec93d7c1ae3d223d555cf0b5 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,45 +1,65 @@
 #!/bin/sh
 
 #!/bin/sh
 

+# test

 if [ 0 -eq 1 ]; then
 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
 

-#fix permissions from git (TODO: should probably move this to git hook)
-chmod go= base/.zshenv base/.Xresources
-
-#create preferred folder structure
-cd "$HOME"
+# create preferred folder structure
+cd ~

 mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
 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 multiple userlands
+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;;
+esac
+

 l() {
        # TODO: use install?
 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
        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
        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 "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"

 done
 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 $fex -mindepth 1 -maxdepth 2 | while read -r x; do

        l "$HOME/.urxvt/ext/`basename $x`"
 done
        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
+cd ~
+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.
+       rm .login_conf.db
+       cap_mkdb .login_conf
+
+fi

 unlink .login_conf
 unlink .login_conf

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

 cd -
 cd -