Improve source_debug() output.

[config/dotfiles.git] / shell / env

diff --git a/shell/env b/shell/env
index 38ee013b9581f0217109b4c1c205fac39bae8c8e..1b9750fee9a466915dfd000cf72d358fbb01000b 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -5,19 +5,28 @@
 #
 # Doesn't fit perfectly in this file, but this is the best place to make it
 # available everywhere.
-function source_debug {
+source_debug() {
     if [ x$DEBUG != x ]; then
         echo $@
     fi
 }
 
 
-source_debug "sourcing ~/.shell/env"
+source_debug ". ~/.shell/env"
 
-# Use UTF-8 encoding in the terminal.
-LC_ALL=en_US.UTF-8
-LANG=$LC_ALL
-export LC_ALL LANG
+
+# 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).
+LANG=en_US.UTF-8
+export LANG
+
+# Add ~/bin and ~/.bin to PATH if available.
+if [ -d ~/bin ]; then
+    PATH=~/bin:$PATH
+fi
+if [ -d ~/.bin ]; then
+    PATH=~/.bin:$PATH
+fi
 
 # Use Vim as editor.
 EDITOR=vim
@@ -29,21 +38,28 @@ export PAGER
 
 # Use ~/tmp as directory for temporary files if available to reduce security
 # problems on multi-user systems.
-if [ -d ~/tmp ]; then
+if [ -O ~/tmp -a -d ~/tmp ]; then
     TMP=~/tmp
+    TEMP=$TMP
     TMPDIR=$TMP
-    export TMP TMPDIR
+    export TMP TEMP TMPDIR
 fi
 
-# Set colors for GNU ls (and zsh completions). This colors files normal (fi),
-# directories blue bold (di), symbolic links cyan (ln), named pipes normal
-# (pi), sockets normal (so), block devices normal (bd), character devices
-# normal (cd), orphaned links with red background (or), setuid (su) and setgid
-# (sg) files with yellow background, directories writable by others with blue
-# background (ow) and executables bold red (ex).
+# Set colors for GNU ls (and zsh completions).
 # See `dircolors --print-database` for possible colors.
-LS_COLORS="no=00:fi=00:di=34;01:ln=36:pi=00:so=00:bd=00:cd=00:\
-or=36;41:su=31;01;43:sg=31;01;43:ow=34;01;41:ex=31;01"
+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
 # supported.
@@ -109,7 +125,7 @@ export LSCOLORS
 # available everywhere.
 #
 # If DEBUG is set to a non empty value additional debug output is printed.
-function source_config {
+source_config() {
     # Path to the file to source and its local counterpart.
     if [ x$4 != x ]; then
         source_file=$1/$2/$3.$4
@@ -141,6 +157,6 @@ function source_config {
     unset source_file source_file_local
 }
 
-source_debug "finished sourcing ~/.shell/env"
+source_debug ". ~/.shell/env (done)"
 
 # vim: ft=sh