From 576c6cdbf5b17938915ad3be3ec392c1d69e612d Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Mon, 24 Oct 2011 22:43:59 +0200 Subject: [PATCH] Cosmetics + moved the selector-related stuff to bash-selector.sh --- bashrc | 57 +++++++-------------------------------------------------- 1 file changed, 7 insertions(+), 50 deletions(-) diff --git a/bashrc b/bashrc index 6c908f4..b2af3d5 100644 --- a/bashrc +++ b/bashrc @@ -90,7 +90,7 @@ export LESS_TERMCAP_me=${VT_RESET} # This prevents ^S from freezing the shell -stty -ixon +# stty -ixon ulimit -c unlimited @@ -105,7 +105,7 @@ alias rd=rmdir alias md='mkdir -v' alias ps='ps uxaf' alias df='df -hT --sync' -alias grep='grep -E --mmap --color=auto' +alias grep='grep -i -E --mmap --color=auto' alias find='ionice -c3 find' alias pd=pushd alias val='valgrind --leak-check=full --show-reachable=yes --db-attach=yes ' @@ -288,7 +288,7 @@ function map () { ## variables function pho () { - PHO_BIN=/usr/bin/pho + PHO_BIN=$(which pho) TEMP=$(mktemp /tmp/pho.XXXXXXX) ${PHO_BIN} "$@" | tee ${TEMP} PHO_NOTE_1=$(grep ^"Note 1: " ${TEMP} | sed -e "s/^[^:]*: //") @@ -349,7 +349,7 @@ function netup () { return 1 fi - echo "${VT_GREEN_FG}Executing [sudo ifup ${ARGS}]${VT_RESET}" + echo "Executing ${VT_GREEN_FG}[sudo ifup ${ARGS}]${VT_RESET}" sudo ifup ${ARGS} # Ugly hack to remove the dsl modem dns server when we add @@ -358,7 +358,7 @@ function netup () { REMOVE_LOCAL_DNS=/usr/local/bin/remove-local-dns.sh if [[ -x ${REMOVE_LOCAL_DNS} ]]; then - echo "${VT_GREEN_FG}Executing [sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" + echo "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" sudo ${REMOVE_LOCAL_DNS} 192.168 fi } @@ -372,7 +372,7 @@ function netdown () { # Otherwise, use the standard ifdown ARGS="$@" fi - echo "${VT_GREEN_FG}Executing sudo [ifdown ${ARGS}]${VT_RESET}" + echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}" sudo ifdown ${ARGS} } @@ -828,54 +828,11 @@ alias dus='dus -f -i' alias finddup='finddup -p' ###################################################################### -# Selector based history -# # The selector command is available on my web site # # git clone http://fleuret.org/git/selector/ -function selector-history () { - selector --bash -u -c 7,4,0,3 -q <(history) -} - -# M-r puts the selected history line in place of the current one - -bind '"\C-[r":"\C-a\C-kselector-history\C-m"' - -# 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"' - -###################################################################### -# Maintain a list of visited directories and provide a selector-based -# command to go back to any of them. - -export SELECTOR_CD_HISTORY - -[[ "${SELECTOR_CD_HISTORY}" ]] || \ - SELECTOR_CD_HISTORY=${HOME}/.selector-cd-history - -function selector-cd () { - if [[ -z "$1" ]]; then - cd - else - cd "$1" - fi - echo $PWD | sed -e "s!${HOME}!~!" >> ${SELECTOR_CD_HISTORY} -} - -function selector-cd-search () { - PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX) - selector -t "cd" -l 10000 -d -i -c 7,4,0,7 -o ${PATH_TEMP} -q ${SELECTOR_CD_HISTORY} - selector-cd "$(cat ${PATH_TEMP} | sed -e 's!~!'${HOME}'!')" - \rm ${PATH_TEMP} -} - -alias cd=selector-cd - -# M-c provides a dynamic list of directories to cd into - -bind '"\C-[c":"\C-a\C-kselector-cd-search\C-m"' +. bash-selector.sh ###################################################################### # And we avoid to put in the history the use of the selector, which we -- 2.39.5