X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/fef6b2b53013bce95a0b0d99a3c2c928665416b1..bf314d35d59a4b7bd8af1ab13cb11bf29cf9452e:/install.sh?ds=inline

diff --git a/install.sh b/install.sh
index 5f2c3d4..25e094a 100755
--- a/install.sh
+++ b/install.sh
@@ -1,65 +1,84 @@
 #!/bin/sh
 
+#NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
+
 # test
-if [ 0 -eq 1 ]; then
-	mkdir() { echo -- "$*"; }
+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 .urxvt/ext > /dev/null 2>&1
-mkdir -m 700 var/tmp var/tmp/vim > /dev/null 2>&1
-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
-fex='-perm -ugo=x'
+lnargs=-sfnv
 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;;
+	freebsd*)		lnargs=-sFhv;;
+	netbsd|openbsd*)	lnargs=-sfhv;;
 esac
 
 l() {
 	# TODO: use install?
-	[ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$x}" "$1"
+	[ -L "$1" -o \! -e "$1" ] && ln $lnargs "${2:-$PWD/$x}" "$1" || \
+		echo "!!! File exists and is not a link: $1"
 }
 
 # link files
-find "$PWD/base" -mindepth 1 -maxdepth 1 | while read -r x; do
+find base -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/`basename "$x"`"
 done
 find bin share -mindepth 1 -maxdepth 1 | while read -r x; do
-	l "$HOME/$x" "$PWD/$x"
+	l "$HOME/$x"
 done
-find "$PWD/xdg" -mindepth 1 -maxdepth 1 | while read -r x; do
-	l "${XDG_CONFIG_HOME:-$HOME/etc}/`basename "$x"`"
+find fonts -mindepth 1 -maxdepth 1 -type d | while read -r x; do
+	l "$HOME/share/fonts/`basename "$x"`"
 done
-find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
+find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
+	l "$HOME/etc/`basename "$x"`"
+done
+find urxvt-ext -mindepth 1 -maxdepth 2 -type f -perm -111 | while read -r x; do
 	l "$HOME/.urxvt/ext/`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
-
+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
-unlink .login_conf
+
 # run .zprofile to set up tmp
-zsh .zprofile
-cd -
+# .zprofile also sources .zshenv for compatibility
+zsh ~/.zprofile