fix TERM and add DVTM_TERM

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index e7a959be15befaa0cf0f7cbada6d9cdab6c1cc70..d2585a8c38abf1a121d69618a70716ff3a2e77bb 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-#fix permissions from git (should probably move this to git hook)
-chmod go= base/.zshenv base/.Xresources
-
+# test

 if [ 0 -eq 1 ]; then
        alias mkdir="echo mkdir"
        alias ln="echo ln"
 if [ 0 -eq 1 ]; then
        alias mkdir="echo mkdir"
        alias ln="echo ln"


@@ -11,26 +9,61 @@ if [ 0 -eq 1 ]; then
        alias unlink="echo unlink"
 fi
 
        alias unlink="echo unlink"
 fi
 

+# 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() {
 l() {

-       [ -L "$1" -o \! -e "$1" ] && ln -sFhvw "$x" "$1"
+       # TODO: use install?
+       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"

 }
 
 }
 

-find "$PWD/base" -depth 1 | while read -r x; do
+
+# 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

        l "$HOME/`basename "$x"`"
 done
        l "$HOME/`basename "$x"`"
 done

-find "$PWD/xdg" -depth 1 | while read -r x; do
-       l "${XDG_CONFIG_HOME:-$HOME/.config}/`basename "$x"`"
+find bin share $d1 | while read -r x; do
+       l "$HOME/$x" "$PWD/$x"

 done
 done

-mkdir -p "$HOME/.urxvt/ext"
-find "$PWD/urxvt-ext" -type f -perm -ugo=x -mindepth 1 -maxdepth 2 | while read -r x; do
+find "$PWD/xdg" $d1 | 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 "$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 [ -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
+
+       # run .zprofile to set up tmp
+       /usr/local/bin/zsh .zprofile
+fi

 unlink .login_conf
 cd -
 unlink .login_conf
 cd -