Fixed the substitution of HOME.

[selector.git] / bash-selector.sh

diff --git a/bash-selector.sh b/bash-selector.sh
index 64cda91..3a478f6 100755 (executable)
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -14,22 +14,38 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.  #
 #                                                                       #
 # Written by and Copyright (C) Francois Fleuret                         #
-# Contact <francois.fleuret@idiap.ch> for comments & bug reports        #
+# Contact <francois@fleuret.org> for comments & bug reports             #
 #########################################################################
 
-# Selector based history
+# This script installs two key-bindings:
+#
+# Alt-r for selector-based command history
+#
+# Alt-c for selector-based directoy history
+#
+# Note that you have to call it with ". bash-selector.sh" otherwise
+# the key-bindings will not be effective in your current bash
+
+######################################################################
+# Selector-based command history
+######################################################################
 
 function selector-history () {
     selector --bash -u -c 7,4,0,3 -q <(history)
 }
 
-# Maintains a list of visited directories and provide a selector-based
-# command to go back to any of them.
+######################################################################
+# Selector-based directory history
+######################################################################
+
+# The file where we will keep track of the directories
 
 export SELECTOR_CD_HISTORY
 
 [[ "${SELECTOR_CD_HISTORY}" ]] || SELECTOR_CD_HISTORY=${HOME}/.selector-cd-history
 
+# The function to use in place of the standard "cd"
+
 function selector-cd () {
     if [[ -z "$1" ]]; then
         cd
@@ -38,7 +54,7 @@ function selector-cd () {
     fi
     TMP=$(mktemp /tmp/selector-cd.XXXXXX)
     tail -1000 < ${SELECTOR_CD_HISTORY} > ${TMP}
-    echo $PWD | sed -e "s!${HOME}!~!" >> ${TMP}
+    echo $PWD | sed -e "s!^${HOME}!~!" >> ${TMP}
     cat ${TMP} > ${SELECTOR_CD_HISTORY}
     rm -f ${TMP}
 }
@@ -48,13 +64,17 @@ function selector-cd-search () {
     selector -u -t "cd" -l 10000 -d -i -c 7,2,0,3 -o ${PATH_TEMP} -q ${SELECTOR_CD_HISTORY}
     NEW_PATH="$(cat ${PATH_TEMP} | sed -e 's!~!'${HOME}'!')"
     if [[ -s "${NEW_PATH}" ]]; then
-        selector-cd "$(cat ${PATH_TEMP} | sed -e 's!~!'${HOME}'!')"
+        selector-cd "$(cat ${PATH_TEMP} | sed -e 's!^~!'${HOME}'!')"
     fi
     \rm ${PATH_TEMP}
 }
 
 alias cd=selector-cd
 
+######################################################################
+# The key-bindings themselves
+######################################################################
+
 # M-r puts the selected history line in place of the current one
 
 bind '"\C-[r":"\C-a\C-kselector-history\C-m"'