X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=bash-selector.sh;h=87df02c8b67986e2024162407f01c35eab34798c;hb=edb1db90ca786eb30c83464380df373a85b339a0;hp=da5bf93f24cd79f46e5393956e2c98438f8a49c8;hpb=98eb78e7763d299e420d670482b3642e04fd1d2e;p=selector.git
diff --git a/bash-selector.sh b/bash-selector.sh
index da5bf93..87df02c 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -1,31 +1,34 @@
#!/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 key-bindings:
+# 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) 2011, 2012 Francois Fleuret
+# Written by Francois Fleuret
#
-# Alt-c for selector-based directoy history
+# This file is part of selector.
#
-# Note that you have to call it with "source bash-selector.sh"
-# otherwise the key-bindings will not be effective in your current
-# bash
+# 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
@@ -37,7 +40,7 @@ fi
######################################################################
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)
}
######################################################################
@@ -70,13 +73,17 @@ function selector-cd () {
}
function selector-cd-search () {
- PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
- 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}'!')"
+ if [[ -f ${SELECTOR_CD_HISTORY} ]]; then
+ PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
+ 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}'!')"
+ fi
+ \rm ${PATH_TEMP}
+ else
+ echo "No cd history file ${SELECTOR_CD_HISTORY}." >&2
fi
- \rm ${PATH_TEMP}
}
alias cd=selector-cd
@@ -95,21 +102,15 @@ if [[ "$1" ]]; then
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
;;
@@ -123,7 +124,7 @@ else
echo "source bash-selector.sh <--hist|--cd> [...]"
echo
- echo "Define bash function to use selector for history search and/or intelligent"
- echo "cd history."
+ 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."
fi