complete previous commit

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 5df39a9c821757cc45a2bd4d509f682968f14d24..2d244b1c5e8a926ea0d6cbc5d104b24a29de54ef 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,35 +1,34 @@
 #!/bin/sh
 
 #!/bin/sh
 

-if [ 0 -eq 1 ]; then
-       alias mkdir="echo mkdir"
+#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
+
+# test
+if [ "$1" = "test" ]; then
+       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"
-mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
-mkdir -m 700 tmp tmp/vim > /dev/null 2>&1
+# create preferred folder structure
+cd ~
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes > /dev/null 2>&1
+mkdir -pm 700 var/tmp var/tmp/vim > /dev/null 2>&1

 cd -
 
 cd -
 

-#accomodate linuxisms
+# accomodate multiple userlands

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

+lnargs=-sfnv
+if [ -z "$OSTYPE" ]; then
+       OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
+fi

 case "$OSTYPE" in
 case "$OSTYPE" 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;;
+       # TODO: make links safer for systems without -Fw
+       freebsd*)               lnargs=-sFhvw;;
+       netbsd|openbsd*)        lnargs=-sfhv;;
+       # android busybox find doesn't have -executable
+       android)                fex=-executable;;

 esac
 
 l() {
 esac
 
 l() {


@@ -37,27 +36,39 @@ l() {
        [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
 }
 
        [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
 }
 

-find "$PWD/base" $d1 | 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 $d1 | 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" $d1 | while read -r x; do
-       l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"
+find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$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
 done
 find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
        l "$HOME/.urxvt/ext/`basename $x`"
 done

+cd "$PWD/xorg"
+for y in icons themes; do
+       find $y -type d -mindepth 2 -maxdepth 2 | while read -r x; do
+               l "$HOME/.$y/`basename "$x"`" "$PWD/$x"
+       done
+done
+cd -
+find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/share/fonts/`basename "$x"`"
+done

 
 cd ~
 
 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.
+if [ "$OSTYPE" = "freebsd" ]; then
+       # 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
        rm .login_conf.db
        cap_mkdb .login_conf
 fi
 unlink .login_conf

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

 cd -
 cd -