From 0b5965cd1e6ed1758170691ac858b74be6e1ea0b Mon Sep 17 00:00:00 2001
From: Francois Fleuret <francois@fleuret.org>
Date: Fri, 22 Jul 2011 11:37:12 +0200
Subject: [PATCH] Miscellaneous updates.

---
 bashrc | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/bashrc b/bashrc
index 2d0f111..3b4910c 100644
--- a/bashrc
+++ b/bashrc
@@ -107,6 +107,8 @@ alias ps='ps uxaf'
 alias df='df -hT --sync'
 alias grep='grep -E --mmap --color=auto'
 alias find='ionice -c3 find'
+alias pd=pushd
+alias val='valgrind --leak-check=full --show-reachable=yes --db-attach=yes '
 
 alias s='screen -d -R -U && clear'
 
@@ -342,7 +344,12 @@ function netup () {
         echo ${ARGS} > ${NETUP_HISTORY}
     fi
 
-    echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}"
+    if [[ $(ps auxwww | grep dhclient | grep -v grep) ]]; then
+        echo "There is already a dhcp client running." >&2
+        return 1
+    fi
+
+    echo "${VT_GREEN_FG}Executing [sudo ifup ${ARGS}]${VT_RESET}"
     sudo ifup ${ARGS}
 
     # Ugly hack to remove the dsl modem dns server when we add
@@ -351,7 +358,7 @@ function netup () {
     REMOVE_LOCAL_DNS=/usr/local/bin/remove-local-dns.sh
 
     if [[ -x ${REMOVE_LOCAL_DNS} ]]; then
-        echo "${VT_GREEN_FG}Running [sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}"
+        echo "${VT_GREEN_FG}Executing [sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}"
         sudo ${REMOVE_LOCAL_DNS} 192.168
     fi
 }
@@ -365,7 +372,7 @@ function netdown () {
         # Otherwise, use the standard ifdown
         ARGS="$@"
     fi
-    echo "${VT_GREEN_FG}Running sudo [ifdown ${ARGS}]${VT_RESET}"
+    echo "${VT_GREEN_FG}Executing sudo [ifdown ${ARGS}]${VT_RESET}"
     sudo ifdown ${ARGS}
 }
 
@@ -850,7 +857,7 @@ export SELECTOR_CD_HISTORY
 
 function selector-cd-search () {
     PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
-    selector -t "cd" -l 10000 -d -i -o ${PATH_TEMP} -q ${SELECTOR_CD_HISTORY}
+    selector -t "cd" -l 10000 -d -i -c 7,4,0,5 -o ${PATH_TEMP} -q ${SELECTOR_CD_HISTORY}
     cd "$(cat ${PATH_TEMP} | sed -e 's!~!'${HOME}'!')"
     \rm ${PATH_TEMP}
 }
@@ -893,6 +900,8 @@ function prompt_command () {
 # save the history after every command to avoid loosing some when
 # multiple shells are open
     history -a
+# load the saved history
+    history -n
 # and the local histories system defined above
     keep_local_history
 # and the history cue
-- 
2.20.1