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

diff --git a/install.sh b/install.sh
index 81ba565..15b9f19 100755
--- a/install.sh
+++ b/install.sh
@@ -3,19 +3,27 @@
 #NOTE: .zshenv XDG paths are hardcoded to allow non-zsh install
 
 # test
+devnull=/dev/null
 if [ "$1" = "test" ]; then
-	mkdir() { echo -- "$@"; }
+	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 share/fonts .urxvt/ext .icons .themes > /dev/null 2>&1
-mkdir -pm 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
 
 # ensure ostype
 if [ -z "$OSTYPE" ]; then
@@ -25,40 +33,52 @@ fi
 # accomodate multiple userlands
 lnargs=-sfnv
 case "$OSTYPE" in
-	# TODO: make links safer for systems without -Fw
-	freebsd*)		lnargs=-sFhvw;;
+	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
+find xdg -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/etc/`basename "$x"`"
 done
-find "$PWD/urxvt-ext" -type f -perm -111 -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
-find "$PWD/xorg/icons" -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+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 "$PWD/xorg/themes" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+find xorg/themes -type d -mindepth 1 -maxdepth 1 | while read -r x; do
 	l "$HOME/.themes/`basename "$x"`"
 done
-find "$PWD/xorg/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
+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
 
 # run .zprofile to set up tmp
 zsh ~/.zprofile