X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=scripts.git;a=blobdiff_plain;f=bashrc;h=3b4910c5476fb809c8e6deb5b82cf178e38f815b;hp=5c97af04936e5e407b5d83a4bb065dfa8fcc073d;hb=0b5965cd1e6ed1758170691ac858b74be6e1ea0b;hpb=13517a908c6d00644d458ccf28cdff07c69bade8 diff --git a/bashrc b/bashrc index 5c97af0..3b4910c 100644 --- a/bashrc +++ b/bashrc @@ -92,6 +92,8 @@ export LESS_TERMCAP_me=${VT_RESET} stty -ixon +ulimit -c unlimited + alias ..='cd ..' alias -- -='cd -' alias rm='rm -i' @@ -103,10 +105,13 @@ alias rd=rmdir alias md='mkdir -v' alias ps='ps uxaf' alias df='df -hT --sync' -alias grep='grep -E --mmap' +alias grep='grep -E --mmap --color=auto' +alias find='ionice -c3 find' +alias pd=pushd +alias val='valgrind --leak-check=full --show-reachable=yes --db-attach=yes ' alias s='screen -d -R -U && clear' -alias mc='echo Try mv ' # I'm fed up with midnight commander + # alias kj="keyjnote -s -D 1000 -t Crossfade -T 100" alias impressive="impressive -s -D 1000 -t Crossfade -T 100" @@ -116,15 +121,14 @@ alias impressive="impressive -s -D 1000 -t Crossfade -T 100" if [ -e "${HOME}/.dircolors" ]; then eval $(dircolors "${HOME}/.dircolors") - alias ls='ls --color' - # alias ll='ls --color -lth' + alias ls='ls --group-directories-first --color' alias lt='ls --color -gohtr --time-style="+%Y %b %d %H:%M"' alias ll='ls --color -goh --time-style="+%Y %b %d %H:%M"' alias lll='ls --color -lth' alias l='ls --color -I "*~" -I "*.o"' alias less='less -R' else - # alias ll='ls -lth' + alias ls='ls --group-directories-first' alias lt='ls -gohtr --time-style="+%Y %b %d %H:%M"' alias ll='ls -goh --time-style="+%Y %b %d %H:%M"' alias lll='ls -lth' @@ -137,12 +141,12 @@ export GIT_EDITOR=${EDITOR} ###################################################################### # Ignored extensions when completing -export FIGNORE="CVS" +# export FIGNORE="CVS" ###################################################################### # Functions -# Find a file containing a name +# Find a file whose name contains a substring function fn () { name=$1 @@ -150,11 +154,45 @@ function fn () { find "$@" -name "*${name}*"; } +function bak () { + while [[ "$1" ]]; do + cp "$1" "$1".bak + shift + done +} + +function ua () { + while [[ "$1" ]]; do + + case "$1" in + + *.tgz|*.tar.gz) + tar zxvf "$1" + ;; + + *.rar) + unrar x "$1" + ;; + + *.zip) + unzip "$1" + ;; + + *) + echo "Unknown file extension $1" + ;; + esac + + shift + + done +} + # Create a dir and cd there function mcd () { - mkdir -vp $1 - cd $1 + mkdir -vp "$1" + cd "$1" } # Capture the screen in a dated png @@ -166,7 +204,7 @@ function cap () { name="capture-$(date +%s).png" fi echo "Waiting $1 s and saving to ${name}." - [[ $1 ]] && sleep $1 + [[ "$1" ]] && sleep "$1" echo "Please click on the window to capture." xwd | convert - ${name} \ls -l ${name} @@ -176,8 +214,8 @@ function cap () { # arguments, do not create one and CD in the most recent instead function cdt () { - if [[ $1 ]]; then - if [[ $1 == "-" ]]; then + if [[ "$1" ]]; then + if [[ "$1" == "-" ]]; then cd $(\ls -td /tmp/tmp.?????? | head -1) else echo "USAGE: cdt [-]" >&2 @@ -207,7 +245,20 @@ function trash () { # alias trash=trash.sh function mmsget () { - mplayer $1 -dumpstream -dumpfile $(basename $1) + mplayer "$1" -dumpstream -dumpfile $(basename "$1") +} + +function quicktex () { + if [[ $1 ]]; then + MAIN=$1 + else + MAIN=$(\ls -t *.tex | head -1 | sed -r -e 's/\.tex//') + fi + pdflatex ${MAIN} + bibtex ${MAIN} + pdflatex ${MAIN} + pdflatex ${MAIN} + xpdf ${MAIN}.pdf } ###################################################################### @@ -218,7 +269,7 @@ function map () { if [ $# -lt 2 ] || [[ ! "$@" =~ :[[:space:]] ]];then echo "Invalid syntax." >&2; return 1 fi - until [[ $1 =~ : ]]; do + until [[ "$1" =~ : ]]; do command="$command $1"; shift done command="$command ${1%:}"; shift @@ -250,14 +301,14 @@ function pho () { } # function rotjpeg () { - # if [ $1 == "90" ] || [ $1 == "180" ] || [ $1 == "270" ]; then + # if [ "$1" == "90" ] || [ "$1" == "180" ] || [ "$1" == "270" ]; then # TEMP=$(mktemp /tmp/rotjpeg.XXXXXX) - # echo jpegtran -rotate $1 -copy all $2 > ${TEMP} + # echo jpegtran -rotate "$1" -copy all $2 > ${TEMP} # echo cp $2 ${2/jpg/}original.jpg # echo cp ${TEMP} $2 # rm ${TEMP} # else - # echo "Can not rotate with an angle of $1 degrees." + # echo "Can not rotate with an angle of "$1" degrees." # fi # } @@ -275,25 +326,30 @@ function dt () { ###################################################################### ## ifup / ifdown with sudo and memorization of the network -## When invoked without an argument this "ifup" uses the same argument -## as the previous time +## When invoked without an argument netup uses the same argument as +## the previous time -## When invoked without an argument this "ifdown" removes the last -## interface which was ifuped +## When invoked without an argument netdown removes the last interface +## which was netuped -[[ ${IFUPRC} ]] || IFUPRC="${HOME}/.ifuprc" +[[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history" -function ifup () { - echo "${VT_BOLD}${VT_GREEN_FG}This is the bash function ifup from .bashrc${VT_RESET}" - if [[ ! "$@" ]] && [[ -s ${IFUPRC} ]]; then - # If we have no argument and there is a .ifuprc, use it - ARGS=$(tail -1 ${IFUPRC}) +function netup () { + if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then + # If we have no argument and there is a .netup_history, use it + ARGS=$(cat ${NETUP_HISTORY}) else # Otherwise uses the given arguments, and store them ARGS="$@" - echo ${ARGS} >> ${IFUPRC} + echo ${ARGS} > ${NETUP_HISTORY} fi - echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}" + + if [[ $(ps auxwww | grep dhclient | grep -v grep) ]]; then + echo "There is already a dhcp client running." >&2 + return 1 + fi + + echo "${VT_GREEN_FG}Executing [sudo ifup ${ARGS}]${VT_RESET}" sudo ifup ${ARGS} # Ugly hack to remove the dsl modem dns server when we add @@ -302,27 +358,32 @@ function ifup () { REMOVE_LOCAL_DNS=/usr/local/bin/remove-local-dns.sh if [[ -x ${REMOVE_LOCAL_DNS} ]]; then - echo "${VT_GREEN_FG}Running [sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" + echo "${VT_GREEN_FG}Executing [sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" sudo ${REMOVE_LOCAL_DNS} 192.168 fi } -function ifdown () { - echo "${VT_BOLD}${VT_GREEN_FG}This is the bash function ifdown from .bashrc${VT_RESET}" - if [[ ! "$@" ]] && [[ -s ${IFUPRC} ]]; then - # If there are no arguments and there is a .ifuprc, get the +function netdown () { + if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then + # If there are no arguments and there is a .netup_history, get the # interface from it - ARGS=$(tail -1 ${IFUPRC} | sed -e "s/=.*$//") + ARGS=$(tail -1 ${NETUP_HISTORY} | sed -e "s/=.*$//") else # Otherwise, use the standard ifdown ARGS="$@" fi - echo "${VT_GREEN_FG}Running sudo [ifdown ${ARGS}]${VT_RESET}" + echo "${VT_GREEN_FG}Executing sudo [ifdown ${ARGS}]${VT_RESET}" sudo ifdown ${ARGS} } function checkgw () { - ping $(route -n | grep ^0.0.0.0 | awk '{print $2}') + GW=$(route -n | grep ^0.0.0.0 | awk '{print $2}') + if [[ -n "${GW}" ]]; then + ping ${GW} + else + echo "Can not find a getaway." >&2 + return 1 + fi } ###################################################################### @@ -377,19 +438,18 @@ function keep () { # I sometime burn CDs and DVDs function burn () { - set -e DEVICE="/dev/cdrw" - if [[ ! $1 ]]; then + if [[ ! "$1" ]]; then echo "burn " >&2 - elif [[ -f $1 ]]; then - if [[ $(file $1 | grep "ISO 9660") ]]; then - wodim -eject -v dev=${DEVICE} $1 + elif [[ -f "$1" ]]; then + if [[ $(file "$1" | grep "ISO 9660") ]]; then + wodim -eject -v dev=${DEVICE} "$1" else echo "Unknown type of $1" >&2 fi - elif [[ -d $1 ]]; then + elif [[ -d "$1" ]]; then TMP=$(mktemp /tmp/cdimage.XXXXXX) && \ - genisoimage -input-charset iso8859-1 -r -o ${TMP} $1 && \ + genisoimage -input-charset iso8859-1 -r -o ${TMP} "$1" && \ wodim -eject -v dev=${DEVICE} ${TMP} rm -f ${TMP} else @@ -403,12 +463,14 @@ function burn () { function dvd () { echo - echo " ! and @ Seek to the beginning of the previous/next chapter" - echo " j Cycle through the available subtitles" - echo " o Show/hide the timing" + echo " ! @ Seek to the beginning of the previous/next chapter" + echo " j Cycle through the available subtitles" + echo " o Show/hide the timing" + echo " x z Subtitle delay" + echo " / * Volume" echo - if [[ $1 ]]; then + if [[ "$1" ]]; then dvd_device="$1" shift else @@ -417,7 +479,7 @@ function dvd () { title="1" - if [[ $1 ]]; then + if [[ "$1" ]]; then title=$1 shift fi @@ -427,6 +489,7 @@ function dvd () { -vc ffmpeg12 -quiet \ -vf yadif \ -alang en \ + -softvol -softvol-max 1000 \ -dvd-device ${dvd_device} dvd://${title} # -slang en @@ -439,6 +502,8 @@ function ripdvd () { time dvdbackup -v -M && eject } +alias ripcd=abcde + ###################################################################### # Upload the sources from the current directory to work @@ -539,8 +604,8 @@ function mksmall () { function mvtoconfig () { CONFIGDIR=${HOME}/sources/config if [[ -d ${CONFIGDIR} ]]; then - NEWNAME=${CONFIGDIR}/$(basename $1 | sed -e "s/^\.//") - mv $1 $NEWNAME + NEWNAME=${CONFIGDIR}/$(basename "$1" | sed -e "s/^\.//") + mv "$1" $NEWNAME ln -s $NEWNAME $1 else echo "Can not find ${CONFIGDIR}" @@ -574,6 +639,8 @@ function git-fm () { ###################################################################### # Commits all directories under git +alias git-ca="echo Are you sure?" + function git-ca () { ORIGINAL_PWD=${PWD} UNCOMMITTED="" @@ -645,8 +712,8 @@ function git-backup () { function bt () { if [[ ${BT_DIR} ]]; then if [[ -d "${BT_DIR}/torrents" ]]; then - if [[ $1 ]]; then - mv $1 ${BT_DIR}/torrents + if [[ "$1" ]]; then + mv "$1" ${BT_DIR}/torrents fi if [[ "$(ps auxwww | grep btlaunchmanycurses | grep -v grep)" ]]; then echo "A client is already running." @@ -768,67 +835,56 @@ alias finddup='finddup -p' # git clone http://fleuret.org/git/selector/ function selector-history () { - selector --bash -c 7,4,0,3 -q <(history) + selector --bash -u -c 7,4,0,3 -q <(history) } -# Find pathes in the history and make a list of the existing ones +# 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 -export CD_HISTORY=${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,5 -o ${PATH_TEMP} -q ${SELECTOR_CD_HISTORY} + cd "$(cat ${PATH_TEMP} | sed -e 's!~!'${HOME}'!')" + \rm ${PATH_TEMP} +} function selector-cd () { - if [[ "$1" == "+" ]]; then - PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX) - selector -d -i -o ${PATH_TEMP} ${CD_HISTORY} - cd "$(cat ${PATH_TEMP} | sed -e 's|~|'${HOME}'|')" - \rm ${PATH_TEMP} + if [[ -z "$1" ]]; then + cd else - if [[ -z "$1" ]]; then - cd - else - cd "$1" - fi - echo $PWD | sed -e "s|${HOME}|~|" >> ${CD_HISTORY} + cd "$1" fi + echo $PWD | sed -e "s!${HOME}!~!" >> ${SELECTOR_CD_HISTORY} } alias cd=selector-cd -alias cdd="cd $(tail -1 ${CD_HISTORY})" # M-c provides a dynamic list of directories to cd into -bind '"\C-[c":"\C-a\C-kselector-cd +\C-m"' - -# function selector-cd () { -# LIST_TEMP=$(mktemp /tmp/selector-cd-list.XXXXXX) -# PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX) -# for d in $(history | \ -# grep ^" *[0-9]* *cd" | \ -# awk '{ print $3 }' | \ -# grep -v "\.\." | \ -# uniq); do -# if [[ -d $d ]]; then -# echo "$d" -# fi -# done >> ${LIST_TEMP} -# selector -d -i -o ${PATH_TEMP} ${LIST_TEMP} -# cd $(cat ${PATH_TEMP}) -# \rm ${LIST_TEMP} -# \rm ${PATH_TEMP} -# } - -# 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"' +bind '"\C-[c":"\C-a\C-kselector-cd-search\C-m"' +###################################################################### # And we avoid to put in the history the use of the selector, which we # do too often HISTIGNORE="${HISTIGNORE}:selector-history" +###################################################################### + function selector-printer () { TMP=$(mktemp /tmp/selector-printer.XXXXXX) selector -o ${TMP} <(lpstat -a | awk '{print $1}') @@ -844,6 +900,8 @@ function prompt_command () { # save the history after every command to avoid loosing some when # multiple shells are open history -a +# load the saved history + history -n # and the local histories system defined above keep_local_history # and the history cue