actually do what was mentioned in previous commit

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 713e7026a0f5d83106393c57bf85531dc2a8d853..7e7471172195fe28021a79bee7d5d8b0b9d674d6 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,41 +1,73 @@
 #!/bin/sh
 
 #!/bin/sh
 

-#fix permissions from git (TODO: should probably move this to git hook)
-chmod go= base/.zshenv base/.Xresources
+#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install

 
 

-if [ 0 -eq 1 ]; then
-       alias mkdir="echo mkdir"
+# 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
 

+# 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 -
+
+# accomodate multiple userlands
+fex='-perm -ugo=x'
+lnargs=-sfnv
+if [ -z "$OSTYPE" ]; then
+       OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
+fi
+case "$OSTYPE" in
+       # 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() {
        # TODO: use install?
 l() {
        # TODO: use install?

-       [ -L "$1" -o \! -e "$1" ] && ln -sFhvw "$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

-mkdir "$HOME/bin"
-find "$PWD/bin" -depth 1 | while read -r x; do
-       l "$HOME/bin/`basename "$x"`"
+find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/$x" "$PWD/$x"

 done
 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 "$HOME/etc/`basename "$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/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"
+find "$PWD/xorg/icons" -type d -mindepth 2 -maxdepth 2 | while read -r x; do
+       l "$HOME/.icons/`basename "$x"`"
+done
+find "$PWD/xorg/themes" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/.themes/`basename "$x"`"
+done
+find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/share/fonts/`basename "$x"`"
+done

 
 

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