shell/env: Remove unnecessary "function".

[config/dotfiles.git] / shell / env

diff --git a/shell/env b/shell/env
index 3395e4beb034b84567b9182bbaa6d5608ccd5bb3..0e15e780a56316c47372b03bb942401409137e64 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -5,7 +5,7 @@
 #
 # 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
@@ -14,15 +14,19 @@ function source_debug {
 
 source_debug "sourcing ~/.shell/env"
 
-# Use UTF-8 encoding in the terminal.
-LC_ALL=en_US.UTF-8
-LANG=$LC_ALL
-export LC_ALL LANG
 
-# Add ~/bin to PATH if available.
+# 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
@@ -34,10 +38,11 @@ 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),
@@ -114,7 +119,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