X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=bash-selector.sh;h=cbf8ed542817204685b7e8c4596ab1a0eff3006e;hb=40783cf11bb49618d80fa3f588632a1c61c0ce2d;hp=020f3edb72afa8b20e35091cbffc98762a20545e;hpb=56285429e6ad644e31f66b006eeff8a92053def8;p=selector.git
diff --git a/bash-selector.sh b/bash-selector.sh
index 020f3ed..cbf8ed5 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -1,36 +1,46 @@
#!/bin/bash
-#########################################################################
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the version 3 of the GNU General Public License #
-# as published by the Free Software Foundation. #
-# #
-# This program is distributed in the hope that it will be useful, but #
-# WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
-# General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see . #
-# #
-# Written by and Copyright (C) Francois Fleuret #
-# Contact for comments & bug reports #
-#########################################################################
-
-# This script installs two keybinding:
+# selector is a simple command line utility for selection of strings
+# with a dynamic pattern-matching.
#
-# Alt-r for selector-based command history
+# Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret
+# Written by Francois Fleuret
#
-# Alt-c for selector-based directoy history
+# This file is part of selector.
#
-# It has to be called with ". bash-selector.sh"
+# selector is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# selector is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with selector. If not, see .
+
+# 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 "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)
}
######################################################################
@@ -51,19 +61,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}
}
@@ -74,13 +88,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