X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bash-selector.sh;h=da5bf93f24cd79f46e5393956e2c98438f8a49c8;hb=95352df58136dd971c591ddb67b2da070d07f3f5;hp=020f3edb72afa8b20e35091cbffc98762a20545e;hpb=56285429e6ad644e31f66b006eeff8a92053def8;p=selector.git
diff --git a/bash-selector.sh b/bash-selector.sh
index 020f3ed..da5bf93 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -14,16 +14,23 @@
# along with this program. If not, see . #
# #
# Written by and Copyright (C) Francois Fleuret #
-# Contact for comments & bug reports #
+# Contact for comments & bug reports #
#########################################################################
-# This script installs two keybinding:
+# This script installs two key-bindings:
#
# Alt-r for selector-based command 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 "source bash-selector.sh"
+# otherwise the key-bindings will not be effective in your current
+# bash
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+ echo "This script must be called with 'source $(basename $0)'" >&2
+ exit 1
+fi
######################################################################
# Selector-based command history
@@ -51,19 +58,23 @@ function selector-cd () {
else
cd "$@"
fi
- TMP=$(mktemp /tmp/selector-cd.XXXXXX)
- tail -1000 < ${SELECTOR_CD_HISTORY} > ${TMP}
- echo $PWD | sed -e "s!${HOME}!~!" >> ${TMP}
- cat ${TMP} > ${SELECTOR_CD_HISTORY}
- rm -f ${TMP}
+
+ if [[ -f ${SELECTOR_CD_HISTORY} ]]; then
+ TMP=$(mktemp /tmp/selector-cd.XXXXXX)
+ tail -999 < ${SELECTOR_CD_HISTORY} > ${TMP}
+ cat ${TMP} > ${SELECTOR_CD_HISTORY}
+ rm -f ${TMP}
+ fi
+
+ echo $PWD | sed -e "s!^${HOME}!~!" >> ${SELECTOR_CD_HISTORY}
}
function selector-cd-search () {
PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
- selector -u -t "cd" -l 10000 -d -i -c 7,2,0,3 -o ${PATH_TEMP} -q ${SELECTOR_CD_HISTORY}
+ selector -u -t "cd" -l 1000 -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}
}
@@ -74,13 +85,45 @@ alias cd=selector-cd
# The key-bindings themselves
######################################################################
-# M-r puts the selected history line in place of the current one
+ # M-t appends the selected history line and the end of the current
+ # one bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"'
+
+if [[ "$1" ]]; then
+
+ while [[ "$1" ]]; do
+
+ case "$1" in
+
+ --hist)
+
+ # M-r puts the selected history line in place of the current one
+
+ bind '"\C-[r":"\C-a\C-kselector-history\C-m"'
+
+ ;;
+
+ --cd)
+
+ # M-c provides a dynamic list of directories to cd into
+
+ bind '"\C-[c":"\C-a\C-kselector-cd-search\C-m"'
+ ;;
+
+
+ *)
+ echo "Unknown argument $1" >&2
+ ;;
+ esac
+
+ shift
-bind '"\C-[r":"\C-a\C-kselector-history\C-m"'
+ done
-# M-t appends the selected history line and the end of the current one
-# bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"'
+else
-# M-c provides a dynamic list of directories to cd into
+ echo "source bash-selector.sh <--hist|--cd> [...]"
+ echo
+ echo "Define bash function to use selector for history search and/or intelligent"
+ echo "cd history."
-bind '"\C-[c":"\C-a\C-kselector-cd-search\C-m"'
+fi