X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=bash-selector.sh;h=87df02c8b67986e2024162407f01c35eab34798c;hp=32e4925957e8d20d464620cdd77748059ce6388e;hb=db0d8f2855537dee1b1a39600d8acecd98f603ed;hpb=a2e9ecbe63af0f7b4b84b1b2a81562714746bcdc

diff --git a/bash-selector.sh b/bash-selector.sh
index 32e4925..87df02c 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 <http://www.gnu.org/licenses/>.  #
-#                                                                       #
-# Written by and Copyright (C) Francois Fleuret                         #
-# Contact <francois.fleuret@idiap.ch> 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) 2011, 2012 Francois Fleuret
+#  Written by Francois Fleuret <francois@fleuret.org>
 #
-# 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 <http://www.gnu.org/licenses/>.
+
+#  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,21 +61,29 @@ 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}
-    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
@@ -74,13 +92,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