X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/3daa445ff2b476ff6f43b649bd0dd8862641d86d..7197cc5c53ffb356e043795356cea46a6414770f:/install.sh?ds=sidebyside

diff --git a/install.sh b/install.sh
index 3eeca8b..2d244b1 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
+
 # test
-if [ 0 -eq 1 ]; then
+if [ "$1" = "test" ]; then
 	mkdir() { echo -- "$*"; }
 	alias ln="echo ln"
 	alias rm="echo rm"
@@ -11,20 +13,20 @@ fi
 
 # create preferred folder structure
 cd ~
-mkdir -p bin etc share .urxvt/ext > /dev/null 2>&1
-mkdir -m 700 var/tmp var/tmp/vim > /dev/null 2>&1
+mkdir -p bin etc share share/fonts .urxvt/ext .icons .themes > /dev/null 2>&1
+mkdir -pm 700 var/tmp var/tmp/vim > /dev/null 2>&1
 cd -
 
 # accomodate multiple userlands
 fex='-perm -ugo=x'
 lnargs=-sfnv
 if [ -z "$OSTYPE" ]; then
-	OSTYPE=`uname -o | tr '[:upper:]' '[:lower:]'`
+	OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
 fi
 case "$OSTYPE" in
 	# TODO: make links safer for systems without -Fw
 	freebsd*)		lnargs=-sFhvw;;
-	netbsd*|openbsd*)	lnargs=-sfhv;;
+	netbsd|openbsd*)	lnargs=-sfhv;;
 	# android busybox find doesn't have -executable
 	android)		fex=-executable;;
 esac
@@ -42,22 +44,29 @@ find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/$x" "$PWD/$x"
 done
 find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
-	l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"
+	l "$HOME/etc/`basename "$x"`"
 done
 find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
 	l "$HOME/.urxvt/ext/`basename $x`"
 done
+cd "$PWD/xorg"
+for y in icons themes; do
+	find $y -type d -mindepth 2 -maxdepth 2 | while read -r x; do
+		l "$HOME/.$y/`basename "$x"`" "$PWD/$x"
+	done
+done
+cd -
+find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+	l "$HOME/share/fonts/`basename "$x"`"
+done
 
 cd ~
 if [ "$OSTYPE" = "freebsd" ]; 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
 # run .zprofile to set up tmp