X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/5b39422d63e5e7410c613dd4eb45285b5202502d..891c15b07a297335ac1e57467840b50b152401cf:/install.sh?ds=inline diff --git a/install.sh b/install.sh index 05715db..d2585a8 100755 --- a/install.sh +++ b/install.sh @@ -1,5 +1,6 @@ #!/bin/sh +# test if [ 0 -eq 1 ]; then alias mkdir="echo mkdir" alias ln="echo ln" @@ -8,38 +9,61 @@ if [ 0 -eq 1 ]; then 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 -cd - +# accomodate linuxisms +fex='-perm -ugo=x' +# TODO: should probably do this better +case "`uname`" 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;; +esac l() { # TODO: use install? - [ -L "$1" -o \! -e "$1" ] && ln -sFhvw "${2:-$x}" "$1" + [ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1" } -find "$PWD/base" -depth 1 | while read -r x; do + +# create preferred folder structure +cd ~ +mkdir -p bin etc share var/run var/log urxvt/ext > /dev/null 2>&1 +mkdir -m 700 var/tmp var/tmp/vim > /dev/null 2>&1 +[ -z "$bsd" ] && mkdir -m 700 tmp > /dev/null 2>&1 +cd - + +# link files +find "$PWD/base" $d1 | while read -r x; do l "$HOME/`basename "$x"`" done -find bin share -depth 1 | while read -r x; do +find bin share $d1 | while read -r x; do l "$HOME/$x" "$PWD/$x" done -find "$PWD/xdg" -depth 1 | while read -r x; do - l "${XDG_CONFIG_HOME:-$HOME/.config}/`basename "$x"`" +find "$PWD/xdg" $d1 | while read -r x; do + l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`" done -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 -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 +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. + rm .login_conf.db + cap_mkdb .login_conf + + # run .zprofile to set up tmp + /usr/local/bin/zsh .zprofile +fi unlink .login_conf cd -