X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=2c81633320a1b737a1e13e3112843326b165c518;hb=5efc050967341ae8dc569496642ca311a41370f7;hp=c1a950e70a465c188558f552f81306851a15fdda;hpb=d1777f8edd13a781c96010fc86b52a96f2080994;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index c1a950e..2c81633 100644
--- a/shell/env
+++ b/shell/env
@@ -1,65 +1,77 @@
 # Configuration file for environment related options for all shells.
 
+# Copyright (C) 2011-2013  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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 Freenode/#screen (2009-10-02 10:25).
+# debugging purposes. Thanks to twb in #screen on Freenode (2009-10-02 10:25
+# CET).
 LANG=en_US.UTF-8
 export LANG
 
+# 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.
-if [ -d ~/.shell/bin ]; then
-    PATH=~/.shell/bin:$PATH
+if test -d "$HOME/.shell/bin"; then
+    PATH="$HOME/.shell/bin:$PATH"
 fi
-if [ -d ~/bin ]; then
-    PATH=~/bin:$PATH
+if test -d "$HOME/bin"; then
+    PATH="$HOME/bin:$PATH"
 fi
-if [ -d ~/.bin ]; then
-    PATH=~/.bin:$PATH
+if test -d "$HOME/.bin"; then
+    PATH="$HOME/.bin:$PATH"
 fi
 
 # Use Vim as editor.
 EDITOR=vim
 export EDITOR
 
-# Set less as pager, its configuration is done through the .less file.
+# Set less as pager, its configuration is done through the ~/.less file.
 PAGER=less
 export PAGER
 
 # Use ~/.tmp as directory for temporary files if available to reduce security
 # problems on multi-user systems.
-if [ -O ~/.tmp -a -d ~/.tmp ]; then
-    TMP=~/.tmp
+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 [ -O ~/tmp -a -d ~/tmp ]; then
-    TMP=~/tmp
+elif test -O "$HOME/tmp" && test -d "$HOME/tmp"; then
+    TMP=$HOME/tmp
     TEMP=$TMP
     TMPDIR=$TMP
     export TMP TEMP TMPDIR
 fi
 
-# Set colors for GNU ls (and zsh completions).
-# See `dircolors --print-database` for possible colors.
-LS_COLORS='no=00'
-LS_COLORS=$LS_COLORS':fi=00'       # normal files: normal
-LS_COLORS=$LS_COLORS':di=34;01'    # directories: blue bold
-LS_COLORS=$LS_COLORS':ln=36'       # symbolic links: cyan
-LS_COLORS=$LS_COLORS':pi=00'       # named pipes: normal
-LS_COLORS=$LS_COLORS':so=00'       # sockets: normal
-LS_COLORS=$LS_COLORS':bd=00'       # block devices: normal
-LS_COLORS=$LS_COLORS':cd=00'       # character devices: normal
-LS_COLORS=$LS_COLORS':or=36;41'    # orphaned links: red background
-LS_COLORS=$LS_COLORS':su=31;01;43' # setuid files: yellow background
-LS_COLORS=$LS_COLORS':sg=31;01;43' # setgid files: yellow background
-LS_COLORS=$LS_COLORS':ow=34;01;41' # directories writable by others: blue background
-LS_COLORS=$LS_COLORS':ex=31;01'    # executables: bold red
-export LS_COLORS
-# Set the same colors for non GNU ls, except for orphaned links which aren't
+# Change rlwrap's home directory to prevent cluttering ~/.
+RLWRAP_HOME="$HOME/.shell/rlwrap"
+export RLWRAP_HOME
+
+# Set colors for GNU ls (and Zsh completions).
+if test -f "$HOME/.shell/dircolors"; then
+    . "$HOME/.shell/dircolors"
+fi
+# Set the same colors for non GNU ls, except for special cases which aren't
 # supported.
 LSCOLORS='ExgxxxxxBxxxxxBdBdExEb'
 #         ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^