actually do what was mentioned in previous commit

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index 5f2c3d4f0f2052693555da277d1e3d5ec06784d2..7e7471172195fe28021a79bee7d5d8b0b9d674d6 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 #!/bin/sh
 

+#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
+

 # test
 # test

-if [ 0 -eq 1 ]; then
+if [ "$1" = "test" ]; then

        mkdir() { echo -- "$*"; }
        alias ln="echo ln"
        alias rm="echo rm"
        mkdir() { echo -- "$*"; }
        alias ln="echo ln"
        alias rm="echo rm"


@@ -11,22 +13,22 @@ fi
 
 # create preferred folder structure
 cd ~
 
 # create preferred folder structure
 cd ~

-mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
-mkdir -m 700 var/tmp var/tmp/vim > /dev/null 2>&1
+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'
 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
 case "$OSTYPE" in
        # TODO: make links safer for systems without -Fw

-       freebsd)        lnargs=-sFhvw;;
-       netbsd|openbsd) lnargs=-sfhv;;
-       *)              lnargs=-sfnv
-                       # android busybox find doesn't have -executable
-                       # and its sh doesn't set OSTYPE :DD
-                       if [ -z "$ANDROID_ROOT" ]; then
-                               fex=-executable
-                       fi;;
+       freebsd*)               lnargs=-sFhvw;;
+       netbsd|openbsd*)        lnargs=-sfhv;;
+       # android busybox find doesn't have -executable
+       android)                fex=-executable;;

 esac
 
 l() {
 esac
 
 l() {


@@ -42,22 +44,28 @@ find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/$x" "$PWD/$x"
 done
 find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
        l "$HOME/$x" "$PWD/$x"
 done
 find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do

-       l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"
+       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

+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

 
 cd ~
 if [ "$OSTYPE" = "freebsd" ]; then
 
 cd ~
 if [ "$OSTYPE" = "freebsd" ]; 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
        # 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
 # run .zprofile to set up tmp
 fi
 unlink .login_conf
 # run .zprofile to set up tmp