add gpg, update install.sh, fix .zshenv.local

[dotfiles.git] / install.sh

diff --git a/install.sh b/install.sh
index eb1366aadcdfd63be2d44e00524bd802e3c5b2a1..25e094a1845ce034326a6673ac67c934cf4565d8 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -1,41 +1,84 @@
 #!/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
+# 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 cap_mkdb="echo cap_mkdb"
-       alias unlink="echo unlink"
+       alias sh="echo sh"
 fi
 
+# create preferred folder structure
+cd ~
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes .gnupg >$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() {
        # TODO: use install?
-       [ -L "$1" -o \! -e "$1" ] && ln -sFhvw "${2:-$x}" "$1"
+       [ -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
-mkdir "$HOME/bin" "$HOME/share" > /dev/null 2>&1
-find bin share -depth 1 | while read -r x; do
-       l "$HOME/$x" "$PWD/$x"
+find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/$x"
+done
+find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
+       l "$HOME/share/fonts/`basename "$x"`"
 done
-find "$PWD/xdg" -depth 1 | while read -r x; do
-       l "${XDG_CONFIG_HOME:-$HOME/.config}/`basename "$x"`"
+find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
+       l "$HOME/etc/`basename "$x"`"
 done
-mkdir -p "$HOME/.urxvt/ext" > /dev/null 2>&1
-find "$PWD/urxvt-ext" -type f -perm -ugo=x -mindepth 1 -maxdepth 2 | while read -r x; do
+find urxvt-ext -mindepth 1 -maxdepth 2 -type f -perm -111 | while read -r x; do
        l "$HOME/.urxvt/ext/`basename $x`"
 done
-touch "$HOME/.hushlogin"
+find xorg/icons -mindepth 1 -maxdepth 2 -type d | while read -r x; do
+       if [ -e "$x/index.theme" ]; then
+               d="$HOME/.icons/`basename "$x"`"
+               l $d
+               which gtk-update-icon-cache >/dev/null 2>&1 && gtk-update-icon-cache -qtf $d
+               unset d
+       fi
+done
+find xorg/themes -mindepth 1 -maxdepth 1 -type d | while read -r x; do
+       l "$HOME/.themes/`basename "$x"`"
+done
+find gpg -mindepth 1 -maxdepth 1 \! -name '*.gpg' | while read -r x; do
+       l "$HOME/.gnupg/`basename "$x"`"
+done
+if which gpg >/dev/null; then
+       find gpg -mindepth 1 -maxdepth 1 -name '*.gpg' | while read -r x; do
+               gpg --import "$x"
+       done
+fi
 
-#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 -
+# run .zprofile to set up tmp
+# .zprofile also sources .zshenv for compatibility
+zsh ~/.zprofile