Merge remote-tracking branch 'origin/master' into build64-par

Conflicts:
	.config/bash/rc.sh
	.config/login.sh
	.config/ssh/config
	.config/wmii/include.sh

5 files changed, 98 insertions, 14 deletions

diff --git a/.local/bin/config-path b/.local/bin/config-path
new file mode 100755
index 0000000..6b9019c
--- /dev/null
+++ b/.local/bin/config-path
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# All the prefixes to consider
+prefixes=(
+	"$HOME"
+	"$HOME/.local.`uname -m`"
+	"$HOME/.local"
+	"$HOME/.prefix.`uname -m`"
+	"$HOME/.prefix"
+	"$HOME"/.gem/ruby/*
+)
+
+######################################################################
+
+in_array() {
+	local needle=$1; shift
+	local haystack=("$@")
+	local straw
+	for straw in "${haystack[@]}"; do
+		[[ "$needle" == "$straw" ]] && return 0
+	done
+	return 1
+}
+
+# Import existing values
+IFS=: paths=($PATH)
+IFS=: rubylibs=($RUBYLIB)
+
+# Scan through prefixes
+for prefix in "${prefixes[@]}"; do
+	# PATH
+	dir="$prefix/bin"
+	if [[ -d "$dir" ]] && ! in_array "$dir" "${paths[@]}"; then
+		paths=("$dir" "${paths[@]}")
+	fi
+	# RUBYLIB
+	dir="$prefix/lib"
+	if [[ -d "$dir" ]] && ! in_array "$dir" "${rubylibs[@]}"; then
+		rubylibs=("$dir" "${rubylibs[@]}")
+	fi
+done
+
+# Finally, print our values
+IFS=: PATH="${paths[*]}"
+IFS=: RUBYLIB="${rubylibs[*]}"
+
+# The sed bit here is the only time we call an external program
+{
+	declare -p PATH
+	declare -p RUBYLIB
+} | sed 's/^declare \(-\S* \)*//'
diff --git a/.local/bin/config-symlinks b/.local/bin/config-symlinks
new file mode 100755
index 0000000..0831ca3
--- /dev/null
+++ b/.local/bin/config-symlinks
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+sed -e '/^\s*$/d' -e '/#/d' symlinks | while read _target _link; do
+	target="$(sed -rn 's|[^/]+/|../|g;s|/[^/]+$|/|p' <<<"$_link")${_target}"
+	link="$HOME/$_link"
+	if [[ -L "$link" ]]; then
+		rm -f "$link"
+	fi
+	if [[ -e "$link" ]]; then
+		echo "ERROR: file exists: $link" >> /dev/stderr
+	else
+		mkdir -p "${link%/*}"
+		ln -s "$target" "$link"
+	fi
+done
diff --git a/.local/bin/notifyd b/.local/bin/notifyd
deleted file mode 100755
index ddd5971..0000000
--- a/.local/bin/notifyd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-connected_to_x_server() {
-	xdpyinfo &>/dev/null
-	return $?
-}
-
-start_backend() {
-	/usr/lib/xfce4/notifyd/xfce4-notifyd
-}
-
-while connected_to_x_server; do
-	start_backend
-done
diff --git a/.local/lib/path.sh b/.local/lib/path.sh
new file mode 100644
index 0000000..a45f8fd
--- /dev/null
+++ b/.local/lib/path.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if type config-path &>/dev/null; then
+	config_path=config-path
+else
+	# Bootstrap finding config-path
+	config_path="$HOME/.local/bin/config-path"
+fi
+eval "$("$config_path" | sed 's/^/export /')"
diff --git a/.local/lib/xdg.sh b/.local/lib/xdg.sh
new file mode 100644
index 0000000..2f3758a
--- /dev/null
+++ b/.local/lib/xdg.sh
@@ -0,0 +1,23 @@
+-nw#!/bin/bash
+# This should be readable by /bin/sh, but I'm going to assume bash.
+
+# Sets up XDG environmental variables, so programs using them don't have to
+# worry about checking if they are set.
+# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+[[ -n $XDG_DATA_HOME ]] || export XDG_DATA_HOME="$HOME/.local/share"
+[[ -n $XDG_CONFIG_HOME ]] || export XDG_CONFIG_HOME="$HOME/.config"
+[[ -n $XDG_DATA_DIRS ]] || export XDG_DATA_DIRS="/usr/local/share/:/usr/share/"
+[[ -n $XDG_CONFIG_IRS ]] || export XDG_CONFIG_DIRS="/etc/xdg"
+[[ -n $XDG_CACHE_HOME ]] || export XDG_CACHE_HOME="$HOME/.cache"
+
+# Check if XDG_RUNTIME_DIR is set, but has a bogus setting
+if [[ -n $XDG_RUNTIME_DIR ]] && [[ ! -d $XDG_RUNTIME_DIR ]]; then
+	unset XDG_RUNTIME_DIR
+fi
+
+# Set XDG_RUNTIME_DIR if we can
+if [[ -z $XDG_RUNTIME_DIR ]] && [[ -n $TMPDIR ]]; then
+	export XDG_RUNTIME_DIR="$TMPDIR/xdg-runtime"
+	install -dm0700 "$XDG_RUNTIME_DIR"
+fi