X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bash-selector.sh;h=dc1ae57f8bf0f1beb18ed62728a00129b4c4ec9e;hb=95a9c82083efd41a6b0af175ef89c7095abf5dde;hp=64cda91182f8a93b48318758809c8c633aeb829a;hpb=cc3b3d1e8410cca68cbaf7556786aa79f1b0ba0e;p=selector.git

diff --git a/bash-selector.sh b/bash-selector.sh
index 64cda91..dc1ae57 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -14,54 +14,110 @@
 # 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        #
+# Contact <francois@fleuret.org> for comments & bug reports             #
 #########################################################################
 
-# Selector based history
+# 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)
 }
 
-# Maintains a list of visited directories and provide a selector-based
-# command to go back to any of them.
+######################################################################
+# Selector-based directory history
+######################################################################
+
+# The file where we will keep track of the directories
 
 export SELECTOR_CD_HISTORY
 
 [[ "${SELECTOR_CD_HISTORY}" ]] || SELECTOR_CD_HISTORY=${HOME}/.selector-cd-history
 
+# The function to use in place of the standard "cd"
+
 function selector-cd () {
     if [[ -z "$1" ]]; then
         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}
 }
 
 alias cd=selector-cd
 
-# M-r puts the selected history line in place of the current one
+######################################################################
+# The key-bindings themselves
+######################################################################
+
+    # 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