#
# 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
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
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
# 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.
#
# 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"
else
source_debug "source_config(): -> neither exists"
fi
+
+ unset source_file source_file_local
}
source_debug "finished sourcing ~/.shell/env"
+
+# vim: ft=sh