diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
commit | 9e79a6c3bbc37c2eec19e055566440f0b1173c5c (patch) | |
tree | 7516e65c0289b9a68b3a97fe2abbdf0d7dba8d8d /.local/lib | |
parent | 5c42078bd052705b69d6ea93ff7617445be43789 (diff) | |
parent | d65775a22e1648eca8e74389a4d9c1c299017cf3 (diff) |
Merge remote-tracking branch 'origin/master' into purdue-cs
Conflicts:
.config/X11/clientrc
.config/bash/rc.d/emacs.sh
.config/bash/rc.sh
.config/conkeror
.config/conkerorrc
.config/emacs/custom.el
.config/irbrc
.config/login.sh
.config/maildirproc/att.rc
.config/maildirproc/default.rc
.config/offlineimaprc
.config/ssh/config
.config/wmii-hg/autostart
.config/wmii-hg/include.sh
.config/wmii-hg/quit
.config/wmii-hg/rbar_battery
.config/wmii-hg/rbar_clock
.config/wmii-hg/rbar_cpu
.config/wmii-hg/rbar_wifi
.conkerorrc
.maildirproc/default.rc
Diffstat (limited to '.local/lib')
-rw-r--r-- | .local/lib/path.sh | 9 | ||||
-rw-r--r-- | .local/lib/xdg.sh | 23 |
2 files changed, 32 insertions, 0 deletions
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..2241d2e --- /dev/null +++ b/.local/lib/xdg.sh @@ -0,0 +1,23 @@ +#!/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_DIRS ]] || 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 |