X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=45b98bcfcf6cd2a666a14c8de347d0faf8f8fd78;hb=b538cc0a5d055ec8884377dab6d7566c687af93b;hp=ed0ec52604843a982a29303717bcdd56d53d7ea4;hpb=07b9aa23a36a1da27f6c6e905cfb887dec5b063d;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index ed0ec52..45b98bc 100644
--- a/shell/env
+++ b/shell/env
@@ -1,7 +1,20 @@
 # Configuration file for environment related options for all shells.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
-. ~/.shell/functions
 
 source_debug ". ~/.shell/env"
 
@@ -11,12 +24,15 @@ source_debug ". ~/.shell/env"
 LANG=en_US.UTF-8
 export LANG
 
-# Add ~/bin and ~/.bin to PATH if available.
-if [ -d ~/bin ]; then
-    PATH=~/bin:$PATH
+# Add ~/bin and ~/.bin and ~/.shell/bin to PATH if available.
+if test -d "$HOME/.shell/bin"; then
+    PATH="$HOME/.shell/bin:$PATH"
 fi
-if [ -d ~/.bin ]; then
-    PATH=~/.bin:$PATH
+if test -d "$HOME/bin"; then
+    PATH="$HOME/bin:$PATH"
+fi
+if test -d "$HOME/.bin"; then
+    PATH="$HOME/.bin:$PATH"
 fi
 
 # Use Vim as editor.
@@ -27,15 +43,25 @@ export EDITOR
 PAGER=less
 export PAGER
 
-# Use ~/tmp as directory for temporary files if available to reduce security
+# 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
+if test -O "$HOME/.tmp" && test -d "$HOME/.tmp"; then
+    TMP=$HOME/.tmp
+    TEMP=$TMP
+    TMPDIR=$TMP
+    export TMP TEMP TMPDIR
+# Also try ~/tmp as fallback.
+elif test -O "$HOME/tmp" && test -d "$HOME/tmp"; then
+    TMP=$HOME/tmp
     TEMP=$TMP
     TMPDIR=$TMP
     export TMP TEMP TMPDIR
 fi
 
+# Change rlwrap's home directory to prevent cluttering ~.
+RLWRAP_HOME="$HOME/.shell/rlwrap"
+export RLWRAP_HOME
+
 # Set colors for GNU ls (and zsh completions).
 # See `dircolors --print-database` for possible colors.
 LS_COLORS='no=00'