X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/3daa445ff2b476ff6f43b649bd0dd8862641d86d..7a20bbac7128368888ea23969b09b99e43def1bc:/install.sh

diff --git a/install.sh b/install.sh
index 3eeca8b..15b9f19 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 >$devnull 2>&1
+mkdir -pm 700 var/tmp var/tmp/vim >$devnull 2>&1
+cd - >$devnull
 
-# accomodate multiple userlands
-fex='-perm -ugo=x'
-lnargs=-sfnv
+# ensure ostype
 if [ -z "$OSTYPE" ]; then
-	OSTYPE=`uname -o | tr '[:upper:]' '[:lower:]'`
+	OSTYPE=`uname -s | tr '[:upper:]' '[:lower:]'`
 fi
+
+# accomodate multiple userlands
+lnargs=-sfnv
 case "$OSTYPE" in
-	# TODO: make links safer for systems without -Fw
-	freebsd*)		lnargs=-sFhvw;;
-	netbsd*|openbsd*)	lnargs=-sfhv;;
-	# android busybox find doesn't have -executable
-	android)		fex=-executable;;
+	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 xdg -mindepth 1 -maxdepth 1 | while read -r x; do
+	l "$HOME/etc/`basename "$x"`"
 done
-find "$PWD/urxvt-ext" -type f $fex -mindepth 1 -maxdepth 2 | while read -r x; do
+find urxvt-ext -type f -perm -111 -mindepth 1 -maxdepth 2 | 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 -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+	if [ -e "$x/index.theme" ]; then
+		l "$HOME/.icons/`basename "$x"`"
+	fi
+done
+find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+	l "$HOME/.themes/`basename "$x"`"
+done
+find fonts -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+	l "$HOME/share/fonts/`basename "$x"`"
+done
+#XXX: potential bug with newlines in profile name (if ff even takes it)
+#XXX: breaks on multiple profiles
+ffdir="`find "$HOME/.mozilla/firefox" -type d -mindepth 1 -maxdepth 1 | head -1 2>$devnull`"
+if [ -d "$ffdir" ]; then
+	find firefox -mindepth 1 -maxdepth 1 | while read -r x; do
+		l "$ffdir/`basename "$x"`"
+	done
+	cd "$ffdir"
+	echo "Updating user.js"
+	sh ./user-js-updater.sh
+	cd - >$devnull
 fi
-unlink .login_conf
+
 # run .zprofile to set up tmp
-zsh .zprofile
-cd -
+zsh ~/.zprofile