From: ds6 Date: Mon, 5 Feb 2018 07:47:37 +0000 (-0600) Subject: fixed install.sh on gnu/busybox/android X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/commitdiff_plain/cf9ecb6f0b3305af5147548c7eda9f054fbf8584?ds=inline fixed install.sh on gnu/busybox/android --- diff --git a/install.sh b/install.sh index 05715db..5df39a9 100755 --- a/install.sh +++ b/install.sh @@ -17,29 +17,47 @@ 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' +case "$OSTYPE" 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 +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 +fi unlink .login_conf cd -