X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=fa7e6da69fb5fd5ce2dc1eafc2cbc87423445bcf;hb=10029386b0efedf07dcf368fdb2fcdd1c85017d0;hp=3840ad0ef83e8964d4bb3b85458be3cd29ea10d9;hpb=40dc04e760ef11e98e31a8d9b29043bb4dc285ab;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index 3840ad0..fa7e6da 100644
--- a/shell/env
+++ b/shell/env
@@ -1,6 +1,6 @@
 # Configuration file for environment related options for all shells.
 
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2015  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,32 +16,43 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-source_debug ". ~/.shell/env"
-
-
 # Use UTF-8 encoding in the terminal. Don't use LC_ALL as it's used for
 # debugging purposes. Thanks to twb in #screen on Freenode (2009-10-02 10:25
 # CET).
 LANG=en_US.UTF-8
 export LANG
+# Use C locale when sorting.
+LC_COLLATE=C
+export LC_COLLATE
 
 # Just in case a nice administrator tries to force LC_ALL on us ...
 unset LC_ALL
-
+# Also reset the rest just in case.
+unset LC_ADDRESS
+unset LC_CTYPE
+unset LC_IDENTIFICATION
+unset LC_MEASUREMENT
+unset LC_MESSAGES
+unset LC_MONETARY
+unset LC_NAME
+unset LC_NUMERIC
+unset LC_PAPER
+unset LC_TELEPHONE
+unset LC_TIME
 # Make sure $LANGUAGE is not set. It's a GNU extension which can overwrite
 # 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
@@ -69,18 +80,21 @@ 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
-    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
-    TMP=$HOME/tmp
-    TEMP=$TMP
-    TMPDIR=$TMP
+# 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"
+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
 fi
 
@@ -110,7 +124,15 @@ LSCOLORS='ExgxxxxxBxxxxxBdBdExEb'
 #         *--------------------- directory
 export LSCOLORS
 
-
-source_debug ". ~/.shell/env (done)"
+# Setup lesspipe to view multiple file-types (like .gz, .zip, etc.) with less.
+# Useful in combination with the "p" alias. Inspired by Debian's default bash
+# files. Thanks.
+if test -x /usr/bin/lesspipe; then
+    # Don't use eval $(lesspipe) which breaks on a few systems (e.g. Gentoo)
+    # due to a different lesspipe implementation.
+    LESSOPEN='| /usr/bin/lesspipe %s'
+    LESSCLOSE='/usr/bin/lesspipe %s %s'
+    export LESSOPEN LESSCLOSE
+fi
 
 # vim: ft=sh