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

diff --git a/shell/env b/shell/env
index ed0ec52..b7b1e13 100644
--- a/shell/env
+++ b/shell/env
@@ -1,8 +1,6 @@
 # Configuration file for environment related options for all shells.
 
 
-. ~/.shell/functions
-
 source_debug ". ~/.shell/env"
 
 
@@ -11,7 +9,10 @@ source_debug ". ~/.shell/env"
 LANG=en_US.UTF-8
 export LANG
 
-# Add ~/bin and ~/.bin to PATH if available.
+# Add ~/bin and ~/.bin and ~/.shell/bin to PATH if available.
+if [ -d ~/.shell/bin ]; then
+    PATH=~/.shell/bin:$PATH
+fi
 if [ -d ~/bin ]; then
     PATH=~/bin:$PATH
 fi
@@ -27,15 +28,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
+if [ -O ~/.tmp -a -d ~/.tmp ]; then
+    TMP=~/.tmp
+    TEMP=$TMP
+    TMPDIR=$TMP
+    export TMP TEMP TMPDIR
+# Also try ~/tmp as fallback.
+elif [ -O ~/tmp -a -d ~/tmp ]; then
     TMP=~/tmp
     TEMP=$TMP
     TMPDIR=$TMP
     export TMP TEMP TMPDIR
 fi
 
+# Change rlwrap's home directory to prevent cluttering ~.
+RLWRAP_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'