fix TERM and add DVTM_TERM

[dotfiles.git] / install.sh

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

+# 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"


@@ -8,25 +9,17 @@ if [ 0 -eq 1 ]; then
        alias unlink="echo unlink"
 fi
 
        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"
-mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
-mkdir -m 700 tmp tmp/vim > /dev/null 2>&1
-cd -
-
-#accomodate linuxisms
+# accomodate linuxisms

 fex='-perm -ugo=x'
 fex='-perm -ugo=x'

-case "$OSTYPE" in
-       *bsd*)  lnargs=-sFhvw
+# TODO: should probably do this better
+case "`uname`" in
+       *BSD*)  lnargs=-sFhvw

                d1='-depth 1'
                bsd=yes;;
        *)      lnargs=-sfnv
                d1='-mindepth 1 -maxdepth 1'
                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
+               # android busybox find doesn't have -execute
+               # and its sh doesn't set OSTYPE :DD

                if [ -z "$ANDROID_ROOT" ]; then
                        fex=-executable
                fi;;
                if [ -z "$ANDROID_ROOT" ]; then
                        fex=-executable
                fi;;


@@ -37,6 +30,15 @@ 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

 find "$PWD/base" $d1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done
 find "$PWD/base" $d1 | while read -r x; do
        l "$HOME/`basename "$x"`"
 done


@@ -54,10 +56,14 @@ cd ~
 if [ -n "$bsd" ]; then
        touch .hushlogin
 
 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.
+       # 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

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

 fi
 unlink .login_conf
 cd -
 fi
 unlink .login_conf
 cd -