Fixed the substitution of HOME.
[selector.git] / bash-selector.sh
index 32e4925..3a478f6 100755 (executable)
 # 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             #
 #########################################################################
 
-# This script installs two keybinding:
+# This script installs two key-bindings:
 #
-# Alt-R for selector-based command history
+# Alt-r for selector-based command history
 #
-# Alt-C for selector-based directoy history
+# Alt-c for selector-based directoy history
 #
-# It has to be called with ". bash-selector.sh"
+# 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
@@ -53,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}
 }
@@ -63,7 +64,7 @@ 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}
 }