abandon $OSTYPE in install, add xdg/cava

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 4ced505139eb124b152e5c1e7c872dd6f83b8a32..985717b406c00acd2ffe65ee4153b91aaded9a3c 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,20 +1,64 @@
 #!/bin/sh
 
 #!/bin/sh
 

-#fix permissions from git (should probably move this to git hook)
+if [ 0 -eq 1 ]; then
+       alias mkdir="echo mkdir"
+       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
 
 chmod go= base/.zshenv base/.Xresources
 

-for x in `find "$PWD/base" -mindepth 1 -maxdepth 1`; do
-       ln -vwis "$x" "$HOME/`basename $x`"
+#create preferred folder structure
+cd "$HOME"
+mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
+mkdir -m 700 tmp tmp/vim > /dev/null 2>&1
+cd -
+
+#accomodate linuxisms
+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;;
+esac
+
+l() {
+       # TODO: use install?
+       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
+}
+
+find "$PWD/base" $d1 | while read -r x; do
+       l "$HOME/`basename "$x"`"
+done
+find bin share $d1 | while read -r x; do
+       l "$HOME/$x" "$PWD/$x"
+done
+find "$PWD/xdg" $d1 | while read -r x; do
+       l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"

 done
 done

-for x in `find "$PWD/xdg" -mindepth 1 -maxdepth 1`; do
-       ln -vwis "$x" "${XDG_CONFIG_HOME:-$HOME/.config}/`basename $x`"
+find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
+       l "$HOME/.urxvt/ext/`basename $x`"

 done
 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 [ -n "$bsd" ]; 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
 cd -
 unlink .login_conf
 cd -