X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=bash-selector.sh;h=7246d4507b334643f0d157f591f070600ead81b3;hb=247055c60e22d0347e5c46259163a9c7fdab5dee;hp=3a478f69a20612f74ddf3b2d7c242b8f40f116c3;hpb=a01943060785bb070dc793818dcd2219c68a5672;p=selector.git
diff --git a/bash-selector.sh b/bash-selector.sh
index 3a478f6..7246d45 100755
--- a/bash-selector.sh
+++ b/bash-selector.sh
@@ -1,72 +1,102 @@
#!/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 ". 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
+ 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)
}
######################################################################
# Selector-based directory history
######################################################################
-# The file where we will keep track of the directories
+# The file where we will keep track of the directories and how many
+# lines to keep in there
export SELECTOR_CD_HISTORY
[[ "${SELECTOR_CD_HISTORY}" ]] || SELECTOR_CD_HISTORY=${HOME}/.selector-cd-history
+export SELECTOR_CD_HISTORY_SIZE
+
+[[ "${SELECTOR_CD_HISTORY_SIZE}" ]] || SELECTOR_CD_HISTORY_SIZE=1000
+
# The function to use in place of the standard "cd"
function selector-cd () {
+ local UMASK=$(umask)
+ umask 077
+
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 -$((SELECTOR_CD_HISTORY_SIZE-1)) < "${SELECTOR_CD_HISTORY}" > "${TMP}"
+ cat "${TMP}" > "${SELECTOR_CD_HISTORY}"
+ \rm -f "${TMP}"
+ fi
+
+ echo "${PWD}" | sed -e "s!^${HOME}!~!" >> "${SELECTOR_CD_HISTORY}"
+ umask ${UMASK}
}
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}'!')"
+ local UMASK=$(umask)
+ umask 077
+
+ if [[ -f "${SELECTOR_CD_HISTORY}" ]]; then
+ PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX)
+ selector -j -y -u -t "cd" -l "${SELECTOR_CD_HISTORY_SIZE}" -d -i -c 7,2,0,3 -o "${PATH_TEMP}" -q "${SELECTOR_CD_HISTORY}"
+ NEW_PATH="$(cat "${PATH_TEMP}" | sed -e 's!~!'${HOME}'!')"
+ if [[ -d "${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}
+ umask ${UMASK}
}
alias cd=selector-cd
@@ -75,13 +105,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