diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
| commit | b68ce750ac90da4fb88669d256666dbaa39f4338 (patch) | |
| tree | cabf50b7a85d1062ba60bd3ebf45fb17965884ca /.local | |
| parent | 15820c5e8ed6f01cf4a87b85126eb7f346ebab3d (diff) | |
| parent | 34bbf66a460e5c622e209211869b3a8bde8a68d5 (diff) | |
Merge remote-tracking branch 'origin/gluglugt60-par' into build64-par
Conflicts:
.config/login.sh
.config/lxpanel/default/config
.config/wmii-hg/config.sh
Diffstat (limited to '.local')
| -rwxr-xr-x | .local/bin/xmessage | 2 | ||||
| -rw-r--r-- | .local/lib/path.sh | 9 | ||||
| -rw-r--r-- | .local/lib/xdg.sh | 23 |
3 files changed, 1 insertions, 33 deletions
diff --git a/.local/bin/xmessage b/.local/bin/xmessage index bd30b5e..08fd95e 100755 --- a/.local/bin/xmessage +++ b/.local/bin/xmessage @@ -1,2 +1,2 @@ #!/bin/sh -gxmessage $@ -fn 'Monospace' +exec gxmessage $@ -fn 'Monospace' diff --git a/.local/lib/path.sh b/.local/lib/path.sh deleted file mode 100644 index a45f8fd..0000000 --- a/.local/lib/path.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 deleted file mode 100644 index 2241d2e..0000000 --- a/.local/lib/xdg.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/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 |