X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=f3e42937f3adf700f08fdf82f206652e8b65cc42;hb=16722ec6ecc626b89b4a8f09477feabad4bc3b00;hp=aa36c92df244a5cd513151799f93d603a8a9b53e;hpb=f48bb5f7372a847a0cd1d5cb2ac3edbea74243f2;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index aa36c92..f3e4293 100644
--- a/shell/env
+++ b/shell/env
@@ -43,16 +43,16 @@ unset LC_TIME
 # variables like $LANG or $LC_ALL.
 unset LANGUAGE
 
-# Add ~/bin and ~/.bin and ~/.shell/bin to PATH if available.
+# Add ~/bin, ~/.bin and ~/.shell/bin to PATH if available.
 if test -d "$HOME/.shell/bin"; then
     PATH="$HOME/.shell/bin:$PATH"
 fi
-if test -d "$HOME/bin"; then
-    PATH="$HOME/bin:$PATH"
-fi
 if test -d "$HOME/.bin"; then
     PATH="$HOME/.bin:$PATH"
 fi
+if test -d "$HOME/bin"; then
+    PATH="$HOME/bin:$PATH"
+fi
 
 # Use Vim as editor.
 EDITOR=vim
@@ -80,16 +80,19 @@ LESS_TERMCAP_so="${escape}[01;30;43m"
 LESS_TERMCAP_se="${escape}[0m"
 export LESS_TERMCAP_so LESS_TERMCAP_se
 
-# Use ~/.tmp as directory for temporary files if available to reduce security
-# problems on multi-user systems.
-if test -O "$HOME/.tmp" && test -d "$HOME/.tmp"; then
+# Prefer a private and most likely fast directory (tmpfs) for temporary files
+# to reduce security problems on multi-user systems.
+if test -n "$XDG_RUNTIME_DIR" && test -d "$XDG_RUNTIME_DIR"; then
+    TMP="$XDG_RUNTIME_DIR"
+# Use ~/.tmp and ~/.tmp as fallback.
+elif test -d "$HOME/.tmp"; then
     TMP="$HOME/.tmp"
-    TEMP="$TMP"
-    TMPDIR="$TMP"
-    export TMP TEMP TMPDIR
-# Also try ~/tmp as fallback.
-elif test -O "$HOME/tmp" && test -d "$HOME/tmp"; then
+elif test -d "$HOME/tmp"; then
     TMP="$HOME/tmp"
+else
+    TMP=
+fi
+if test -n "$TMP"; then
     TEMP="$TMP"
     TMPDIR="$TMP"
     export TMP TEMP TMPDIR
@@ -132,4 +135,8 @@ if test -x /usr/bin/lesspipe; then
     export LESSOPEN LESSCLOSE
 fi
 
+# Additional command line options for `mtr`.
+MTR_OPTIONS='--show-ips'
+export MTR_OPTIONS
+
 # vim: ft=sh