X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=bash-selector.sh;h=87df02c8b67986e2024162407f01c35eab34798c;hp=e7fb46101478eea86399d3c60d6054738ca98c0c;hb=db0d8f2855537dee1b1a39600d8acecd98f603ed;hpb=f8c68646bac4ea3989fb31cfc048248b0b946a6b diff --git a/bash-selector.sh b/bash-selector.sh index e7fb461..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 @@ -70,13 +73,17 @@ function selector-cd () { } function selector-cd-search () { - 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}'!')" + 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