X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=scripts.git;a=blobdiff_plain;f=bashrc;h=3b4910c5476fb809c8e6deb5b82cf178e38f815b;hp=5be565dacebbc104dbe35c62327ee26040f504a1;hb=0b5965cd1e6ed1758170691ac858b74be6e1ea0b;hpb=20794e99b3635c6b364f536631d779f8f3d78b28

diff --git a/bashrc b/bashrc
index 5be565d..3b4910c 100644
--- a/bashrc
+++ b/bashrc
@@ -53,36 +53,49 @@ shopt -s histappend
 ######################################################################
 ## The interactive part
 
-export VT_RESET=$'\033[0m'
-export VT_BOLD=$'\033[1m'
-export VT_UNDERLINE=$'\033[4m'
-export VT_BLINK=$'\033[5m'
+export VT_RESET=$'\e[0m'
+export VT_BOLD=$'\e[1m'
+export VT_UNDERLINE=$'\e[4m'
+export VT_BLINK=$'\e[5m'
 
-export VT_SET_TITLE=$'\033]0;'
+export VT_SET_TITLE=$'\e]0;'
 export VT_END_TITLE=$'\007'
 
-export VT_BLACK_FG=$'\033[30m'
-export VT_RED_FG=$'\033[31m'
-export VT_GREEN_FG=$'\033[32m'
-export VT_YELLOW_FG=$'\033[33m'
-export VT_BLUE_FG=$'\033[34m'
-export VT_MAGENTA_FG=$'\033[35m'
-export VT_CYAN_FG=$'\033[36m'
-export VT_WHITE_FG=$'\033[37m'
-
-export VT_BLACK_BG=$'\033[40m'
-export VT_RED_BG=$'\033[41m'
-export VT_GREEN_BG=$'\033[42m'
-export VT_YELLOW_BG=$'\033[43m'
-export VT_BLUE_BG=$'\033[44m'
-export VT_MAGENTA_BG=$'\033[45m'
-export VT_CYAN_BG=$'\033[46m'
-export VT_WHITE_BG=$'\033[47m'
+export VT_BLACK_FG=$'\e[30m'
+export VT_RED_FG=$'\e[31m'
+export VT_GREEN_FG=$'\e[32m'
+export VT_YELLOW_FG=$'\e[33m'
+export VT_BLUE_FG=$'\e[34m'
+export VT_MAGENTA_FG=$'\e[35m'
+export VT_CYAN_FG=$'\e[36m'
+export VT_WHITE_FG=$'\e[37m'
+
+export VT_BLACK_BG=$'\e[40m'
+export VT_RED_BG=$'\e[41m'
+export VT_GREEN_BG=$'\e[42m'
+export VT_YELLOW_BG=$'\e[43m'
+export VT_BLUE_BG=$'\e[44m'
+export VT_MAGENTA_BG=$'\e[45m'
+export VT_CYAN_BG=$'\e[46m'
+export VT_WHITE_BG=$'\e[47m'
+
+# Colorize man pages!
+
+export LESS_TERMCAP_us=${VT_GREEN_FG}
+export LESS_TERMCAP_ue=${VT_RESET}
+export LESS_TERMCAP_md=${VT_BLUE_FG}${VT_BOLD}
+export LESS_TERMCAP_me=${VT_RESET}
+
+# export LESS_TERMCAP_md=$'\e[1;34;40m'
 
 # This prevents ^S from freezing the shell
 
 stty -ixon
 
+ulimit -c unlimited
+
+alias ..='cd ..'
+alias -- -='cd -'
 alias rm='rm -i'
 alias mv='mv -i'
 # alias chmod='chmod -v'
@@ -92,11 +105,15 @@ 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 kj="keyjnote -s -D 1000 -t Crossfade -T 100"
+alias impressive="impressive -s -D 1000 -t Crossfade -T 100"
 
 # alias fdupes='fdupes -r .'
 
@@ -104,16 +121,17 @@ alias kj="keyjnote -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'
     alias l='ls -I "*~" -I "*.o"'
 fi
 
@@ -123,30 +141,124 @@ 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
     shift
-    find $* -name "*${name}*";
+    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
+
+function cap () {
+    if [[ $2 ]]; then
+        name=$2
+    else
+        name="capture-$(date +%s).png"
+    fi
+    echo "Waiting $1 s and saving to ${name}."
+    [[ "$1" ]] && sleep "$1"
+    echo "Please click on the window to capture."
+    xwd  | convert - ${name}
+    \ls -l ${name}
+}
+
+# Create and CD in a /tmp/tmp.XXXXXX directory. With the '-'
+# arguments, do not create one and CD in the most recent instead
+
+function cdt () {
+    if [[ "$1" ]]; then
+        if [[ "$1" == "-" ]]; then
+            cd $(\ls -td /tmp/tmp.?????? | head -1)
+        else
+            echo "USAGE: cdt [-]" >&2
+            return 1
+        fi
+    else
+        cd $(mktemp -d /tmp/tmp.XXXXXX)
+    fi
+}
+
+alias t='cd /tmp'
+
+function trash () {
+    TRASH=$(date +/tmp/trash-%Y-%b-%d-%Hh)
+
+    if [[ -d ${TRASH} ]]; then
+        echo "Re-use ${TRASH}"
+    else
+        mkdir ${TRASH}
+        echo "Created ${TRASH}"
+    fi
+
+    mv "$@" ${TRASH}
+    echo "Trashed $@"
 }
 
-alias trash=trash.sh
+# 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
 }
 
 ######################################################################
@@ -157,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
@@ -178,7 +290,7 @@ function map () {
 function pho () {
     PHO_BIN=/usr/bin/pho
     TEMP=$(mktemp /tmp/pho.XXXXXXX)
-    ${PHO_BIN} $* | tee ${TEMP}
+    ${PHO_BIN} "$@" | tee ${TEMP}
     PHO_NOTE_1=$(grep ^"Note 1: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_2=$(grep ^"Note 2: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_3=$(grep ^"Note 3: " ${TEMP} | sed -e "s/^[^:]*: //")
@@ -189,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
 # }
 
@@ -214,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=$(cat ${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}
+        ARGS="$@"
+        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
@@ -241,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=$(cat ${IFUPRC} | sed -e "s/=.*$//")
+        ARGS=$(tail -1 ${NETUP_HISTORY} | sed -e "s/=.*$//")
     else
         # Otherwise, use the standard ifdown
-        ARGS=$*
+        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
 }
 
 ######################################################################
@@ -270,8 +392,9 @@ function checkgw () {
 function lr () {
     HEIGHT=$(stty size | awk '{print $1}')
     WIDTH=$(stty size | awk '{print $2}')
-    \ls -goth  --time-style="+%Y %b %d %H:%M" $* | head -$((HEIGHT-2)) | cut -b1-${WIDTH}
-    # \ls -lth $* | head -$((HEIGHT-2)) | cut -b1-${WIDTH}
+    \ls -goth --time-style="+%Y %b %d %H:%M" "$@" | \
+        head -$((HEIGHT-2)) | \
+        cut -b1-${WIDTH}
 }
 
 ######################################################################
@@ -284,7 +407,7 @@ function lr () {
 # You can change the xterm background color on the fly!
 
 function setxtermbg () {
-    echo -n $'\033]11;'$1$'\007'
+    echo -n $'\e]11;'$1$'\007'
 }
 
 ######################################################################
@@ -315,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 <iso name | dirname>" >&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
@@ -341,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
@@ -355,7 +479,7 @@ function dvd () {
 
     title="1"
 
-    if [[ $1 ]]; then
+    if [[ "$1" ]]; then
         title=$1
         shift
     fi
@@ -365,6 +489,7 @@ function dvd () {
         -vc ffmpeg12 -quiet \
         -vf yadif \
         -alang en \
+        -softvol -softvol-max 1000 \
         -dvd-device ${dvd_device} dvd://${title}
 
 # -slang en
@@ -377,6 +502,8 @@ function ripdvd () {
     time dvdbackup -v -M && eject
 }
 
+alias ripcd=abcde
+
 ######################################################################
 # Upload the sources from the current directory to work
 
@@ -477,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}"
@@ -512,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=""
@@ -583,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."
@@ -662,7 +791,7 @@ function keep_local_history () {
         # mv would replace a symbolic link, while cp keeps it
         \cp ${TMP} ${LOCAL_HISTORY_FILE}
         \rm ${TMP}
-        LOCAL_HISTORY_HINT=" LH "
+        LOCAL_HISTORY_HINT="* "
     else
         LOCAL_HISTORY_HINT=""
     fi
@@ -673,8 +802,6 @@ PS1="\[${VT_WHITE_BG}\]\${LOCAL_HISTORY_HINT}\[${VT_RESET}\]${PS1}"
 ######################################################################
 # Switch off the history
 
-alias nh=" export HISTFILE=/dev/null"
-
 function histfile_cue () {
     if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]]; then
         HISTORY_CUE="[${HISTFILE}]"
@@ -690,7 +817,7 @@ PS1="\[${VT_YELLOW_BG}\]\${HISTORY_CUE}\[${VT_RESET}\]${PS1}"
 #
 # git clone http://fleuret.org/git/dus/
 
-alias dus='dus -f'
+alias dus='dus -f -i'
 
 ######################################################################
 # The finddup command is available on my web site
@@ -700,11 +827,6 @@ alias dus='dus -f'
 # alias finddup='finddup -p0d'
 alias finddup='finddup -p'
 
-######################################################################
-# This script grep messages in my mail archives
-
-alias gma='gma.sh'
-
 ######################################################################
 # Selector based history
 #
@@ -713,27 +835,7 @@ alias gma='gma.sh'
 # git clone http://fleuret.org/git/selector/
 
 function selector-history () {
-    selector --bash -c 7,4,0,3 -q <(history)
-}
-
-# Find pathes in the history and make a list of the existing ones
-
-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}
+    selector --bash -u -c 7,4,0,3 -q <(history)
 }
 
 # M-r puts the selected history line in place of the current one
@@ -744,15 +846,45 @@ bind '"\C-[r":"\C-a\C-kselector-history\C-m"'
 
 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-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 [[ -z "$1" ]]; then
+        cd
+    else
+        cd "$1"
+    fi
+    echo $PWD | sed -e "s!${HOME}!~!" >> ${SELECTOR_CD_HISTORY}
+}
+
+alias cd=selector-cd
+
 # M-c provides a dynamic list of directories to cd into
 
-bind '"\C-[c":"\C-a\C-kselector-cd\C-m"'
+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}')
@@ -768,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