# 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:
+# This bash script adds two key bindings:
#
-# Alt-r for selector-based command history
+# Alt-r to access a selector-based command history
#
-# Alt-c for selector-based directoy history
+# Alt-c to access a selector-based directory history
#
# Note that you have to call it with "source bash-selector.sh"
-# otherwise the key-bindings will not be effective in your current
+# otherwise the key bindings will not be effective in your current
# bash
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
export SELECTOR_CD_HISTORY
-[[ "${SELECTOR_CD_HISTORY}" ]] || SELECTOR_CD_HISTORY=${HOME}/.selector-cd-history
+[[ "${SELECTOR_CD_HISTORY}" ]] || SELECTOR_CD_HISTORY="${HOME}/.selector-cd-history"
export SELECTOR_CD_HISTORY_SIZE
# The function to use in place of the standard "cd"
function selector-cd () {
- UMASK=$(umask)
+ local UMASK=$(umask)
umask 077
if [[ -z "$1" ]]; then
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}"
+ tail -$((SELECTOR_CD_HISTORY_SIZE-1)) < "${SELECTOR_CD_HISTORY}" >| "${TMP}" && \
+ cat "${TMP}" >| "${SELECTOR_CD_HISTORY}"
\rm -f "${TMP}"
fi
}
function selector-cd-search () {
- UMASK=$(umask)
+ local UMASK=$(umask)
umask 077
if [[ -f "${SELECTOR_CD_HISTORY}" ]]; then
alias cd=selector-cd
######################################################################
-# The key-bindings themselves
+# The key bindings themselves
######################################################################
# M-t appends the selected history line and the end of the current
--hist)
# M-r puts the selected history line in place of the current one
- bind '"\C-[r":"\C-a\C-kselector-history\C-m"'
+ bind '"\C-[r":"\C-a\C-k selector-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"'
+ bind '"\C-[c":"\C-a\C-k selector-cd-search\C-m"'
;;
*)
else
- echo "source bash-selector.sh <--hist|--cd> [...]"
+ echo "source bash-selector.sh [--hist] [--cd]"
echo
- echo "Defines bash functions, and installs key-bindings and aliases to use selector"
+ 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