X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=e8a1789df7cf0e37ef929ba176e4d7b3d7ba8e1d;hb=262a10162543ebbb237a1724e994b09cdfd852a2;hp=c654613b77a9c838b5284aa159cdecd3991a3fdf;hpb=c3ccdced26ff5d9baf36858968701e7b12447cd6;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index c654613..e8a1789 100644
--- 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() {
+function source_debug {
     if [ x$DEBUG != x ]; then
         echo $@
     fi
@@ -19,6 +19,11 @@ LC_ALL=en_US.UTF-8
 LANG=$LC_ALL
 export LC_ALL LANG
 
+# Add ~/bin to PATH if available.
+if [ -d ~/bin ]; then
+    PATH=~/bin:$PATH
+fi
+
 # Use Vim as editor.
 EDITOR=vim
 export EDITOR
@@ -27,6 +32,15 @@ export EDITOR
 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
+    TEMP=$TMP
+    TMPDIR=$TMP
+    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
@@ -65,6 +79,7 @@ export LSCOLORS
 #     in $1.
 # $3: Base name of file in $2, for example "rc" or "env".
 # $4: Extension for $3, if this file doesn't exist "$1/$3.local" is sourced.
+#     Can be empty, then no extension is used.
 # $5: Additional options, set to nolocal to prevent loading of "$1/$3.local"
 #                         if "$1/$2/$3.$4" doesn't exist.
 #
@@ -91,14 +106,25 @@ export LSCOLORS
 # source_config zsh os   env $os       nolocal # loads os/rc.Darwin
 # source_config zsh host env $hostname         # loads env.local
 #
+# By letting $4 empty normal configuration files can be sourced. A .local can
+# still be used.
+#
+# source_config zsh "" file # loads zsh/file if it exists
+#
 # Doesn't fit perfectly in this file, but this is the best place to make it
 # available everywhere.
 #
 # If DEBUG is set to a non empty value additional debug output is printed.
-function source_config() {
+function source_config {
     # Path to the file to source and its local counterpart.
-    local source_file=$1/$2/$3.$4
-    local source_file_local=$1/$3.local
+    if [ x$4 != x ]; then
+        source_file=$1/$2/$3.$4
+    # If $4 is empty don't append a trailing dot. This allows source_config()
+    # to load normal configuration files.
+    else
+        source_file=$1/$2/$3
+    fi
+    source_file_local=$1/$3.local
 
     # Additional debug output.
     source_debug "source_config(): checking if $source_file exists"
@@ -106,17 +132,21 @@ function source_config() {
 
     # If the file does exist then source it.
     if [ -f $source_file ]; then
-        source_debug "source_config(): sourcing $source_file"
-        source $source_file
+        source_debug "source_config(): -> sourcing $source_file"
+        . $source_file
 
     # Otherwise load the .local file if it exists and .local files are
     # allowed.
     elif [ -f $source_file_local -a x$5 != xnolocal ]; then
-        source_debug "source_config(): sourcing $source_file_local"
-        source $source_file_local
+        source_debug "source_config(): -> sourcing $source_file_local"
+        . $source_file_local
     else
-        source_debug "source_config(): neither exists"
+        source_debug "source_config(): -> neither exists"
     fi
+
+    unset source_file source_file_local
 }
 
 source_debug "finished sourcing ~/.shell/env"
+
+# vim: ft=sh