shell/aliases: Add aliases for ls (l) and cd (d).

[config/dotfiles.git] / shell / env

diff --git a/shell/env b/shell/env
index 38ee013b9581f0217109b4c1c205fac39bae8c8e..a9163179c41d755a8a013d3d606f5794f0e26001 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -14,10 +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
+
+# 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,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),