X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/f8a63688540cf844bec7dc7b2c9246b64f43350a..ba63cd0158e197430b326c7ecac884b285bab1c0:/install.sh?ds=sidebyside

diff --git a/install.sh b/install.sh
index 985717b..ae7c688 100755
--- a/install.sh
+++ b/install.sh
@@ -1,36 +1,31 @@
 #!/bin/sh
 
 if [ 0 -eq 1 ]; then
-	alias mkdir="echo mkdir"
+	mkdir() { echo "$*"; }
 	alias ln="echo ln"
 	alias rm="echo rm"
 	alias cap_mkdb="echo cap_mkdb"
 	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"
+cd ~
 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;;
+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;;
 esac
 
 l() {
@@ -38,13 +33,13 @@ l() {
 	[ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
 }
 
-find "$PWD/base" $d1 | while read -r x; do
+find "$PWD/base" -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/`basename "$x"`"
 done
-find bin share $d1 | while read -r x; do
+find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/$x" "$PWD/$x"
 done
-find "$PWD/xdg" $d1 | while read -r x; do
+find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"
 done
 find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
@@ -52,7 +47,7 @@ find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
 done
 
 cd ~
-if [ -n "$bsd" ]; then
+if [ "$OSTYPE" = "freebsd" ]; then
 	touch .hushlogin
 
 	#FreeBSD tries `_secure_path' on `.login_conf' before reading the database,