Merge remote-tracking branch 'uni/master'

diff --git a/bin/calc b/bin/calc
index a71e7836b2906064c43f6e880b69831ee49bbb23..7f4b0357c4542a31c1d03490f7360c010ea40111 100755 (executable)
--- a/bin/calc
+++ b/bin/calc
@@ -9,3 +9,5 @@ def binom(n,k):
     return reduce(lambda a,b: a*(n-b)/(b+1),xrange(k),1)
 
 print "Welcome to the ultimate calculator."'
+
+# vim: ft=python

diff --git a/bin/valgrind.sh b/bin/valgrind.sh
index dd8038ac518ff3c413079fd0bb6720f14f51b13e..92ef3ab55e68eadd463a7186ecb19ad72f4214c1 100755 (executable)
--- a/bin/valgrind.sh
+++ b/bin/valgrind.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-valgrind --leak-check=full --show-reachable=yes --error-exitcode=1 "$@"
+valgrind --leak-check=full --show-reachable=yes --error-exitcode=1 \
+         --track-fds=yes "$@"

diff --git a/setup.sh b/setup.sh
index ec6f9d749364a2f4f8c84d086561e911974f2da4..4318125a535ac89a35f71cf0f0429d0e978e8254 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -58,3 +58,6 @@ if installed colordiff; then
 fi
 link inputrc ~/.inputrc
 link screenrc ~/.screenrc
+
+# Create rlwrap history directory.
+mkdir -p shell/rlwrap

diff --git a/shell/env b/shell/env
index c1a950e70a465c188558f552f81306851a15fdda..b7b1e13a28d7e17b56c02e1693d01d26cacc61b3 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -43,6 +43,10 @@ elif [ -O ~/tmp -a -d ~/tmp ]; then
     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'