X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bash-selector.sh;h=e7fb46101478eea86399d3c60d6054738ca98c0c;hb=f8c68646bac4ea3989fb31cfc048248b0b946a6b;hp=adca50855638bde9cdc85b84d327f5758d3ff564;hpb=4d78182aa8ec7f31c89789ceef2af3d1f36211b6;p=selector.git
diff --git a/bash-selector.sh b/bash-selector.sh
index adca508..e7fb461 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -14,7 +14,7 @@
# 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 key-bindings:
@@ -23,15 +23,21 @@
#
# 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
+# 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
######################################################################
function selector-history () {
- selector --bash -u -c 7,4,0,3 -q <(history)
+ selector --bash -j -y -u -c 7,4,0,3 -q <(history)
}
######################################################################
@@ -52,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 -j -y -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}
}
@@ -75,13 +85,39 @@ 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 "Defines bash functions, and installs key-bindings and aliases to use selector"
+ echo "for history search with M-r and/or intelligent cd history with M-c."
-bind '"\C-[c":"\C-a\C-kselector-cd-search\C-m"'
+fi