X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=bd529ba1ce2f5ef25542d3d7a48f9e9394062add;hb=b989d9f7f42034ee72f5458d04df1e224e6a3d50;hp=fecb6fd609fc3f27d8f882bba6c1457628547998;hpb=d6641d7f00d7702ed735ae03bd6b39b57eaf399c;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index fecb6fd..bd529ba 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,9 +16,6 @@
 # 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).
@@ -30,21 +27,32 @@ 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
@@ -74,16 +82,16 @@ 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
+if 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
+elif test -d "$HOME/tmp"; then
+    TMP="$HOME/tmp"
+    TEMP="$TMP"
+    TMPDIR="$TMP"
     export TMP TEMP TMPDIR
 fi
 
@@ -113,7 +121,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