clean .zprofile vars, update zsh opts, fix dpass

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index e7a959be15befaa0cf0f7cbada6d9cdab6c1cc70..15b9f199c4d4235782537d04adcb43adb07321f0 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,36 +1,84 @@
 #!/bin/sh
 
 #!/bin/sh
 

-#fix permissions from git (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
+# test
+devnull=/dev/null
+if [ "$1" = "test" ]; then
+       echo "Running test -- no changes will be applied"
+       devnull=/dev/stdout
+       _cd() {
+               cd $*;
+               echo "  cd $*";
+               echo "\$PWD=$PWD";
+       }
+       alias cd="_cd"

        alias mkdir="echo mkdir"
        alias ln="echo ln"
        alias rm="echo rm"
        alias mkdir="echo mkdir"
        alias ln="echo ln"
        alias rm="echo rm"

-       alias cap_mkdb="echo cap_mkdb"
-       alias unlink="echo unlink"
+       alias sh="echo sh"

 fi
 
 fi
 

+# create preferred folder structure
+cd ~
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes >$devnull 2>&1
+mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
+cd - >$devnull
+
+# ensure ostype
+if [ -z "$OSTYPE" ]; then
+       OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
+fi
+
+# accomodate multiple userlands
+lnargs=-sfnv
+case "$OSTYPE" in
+       freebsd*)               lnargs=-sFhv;;
+       netbsd|openbsd*)        lnargs=-sfhv;;
+esac
+

 l() {
 l() {

-       [ -L "$1" -o \! -e "$1" ] && ln -sFhvw "$x" "$1"
+       # TODO: use install?
+       [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$PWD/$x}" "$1" || \
+               echo "!!! File exists and is not a link: $1"

 }
 
 }
 

-find "$PWD/base" -depth 1 | while read -r x; do
+# link files
+find base -mindepth 1 -maxdepth 1 | 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 -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/$x"
+done
+find 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 urxvt-ext -type f -perm -111 -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
-unlink .login_conf
-cd -
+find xorg/icons -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+       if [ -e "$x/index.theme" ]; then
+               l "$HOME/.icons/`basename "$x"`"
+       fi
+done
+find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/.themes/`basename "$x"`"
+done
+find fonts -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/share/fonts/`basename "$x"`"
+done
+#XXX: potential bug with newlines in profile name (if ff even takes it)
+#XXX: breaks on multiple profiles
+ffdir="`find "$HOME/.mozilla/firefox" -type d -mindepth 1 -maxdepth 1 | head -1 2>$devnull`"
+if [ -d "$ffdir" ]; then
+       find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
+               l "$ffdir/`basename "$x"`"
+       done
+       cd "$ffdir"
+       echo "Updating user.js"
+       sh ./user-js-updater.sh
+       cd - >$devnull
+fi
+
+# run .zprofile to set up tmp
+zsh ~/.zprofile