X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=scripts.git;a=blobdiff_plain;f=bashrc;h=ef555d6f4205da62e2d22b04f0df03f20dee1ff3;hp=6c908f49edefe146990e35d6fb62f661aa930166;hb=5d2e211f0e3dbd1b497b41f4f0c2524eeb9aed32;hpb=f8342131f317c55351b29af45d640b007d66e754

diff --git a/bashrc b/bashrc
index 6c908f4..ef555d6 100644
--- a/bashrc
+++ b/bashrc
@@ -50,6 +50,10 @@ shopt -s histappend
 
 [[ ${TERM} == "dumb" ]] || [ ! -t 0 ] && return
 
+# Remove the annoying beeps in console
+
+setterm -blength 0
+
 ######################################################################
 ## The interactive part
 
@@ -90,7 +94,7 @@ export LESS_TERMCAP_me=${VT_RESET}
 
 # This prevents ^S from freezing the shell
 
-stty -ixon
+# stty -ixon
 
 ulimit -c unlimited
 
@@ -105,13 +109,28 @@ 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 --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'
 
+function nh () {
+    export HISTFILE=/dev/null
+    unalias cd
+}
+
+function ding () {
+    if [[ $1 && $(which winshepherd.sh) ]]; then
+        play -q ~/local/sounds/deskbell.wav &
+        unset E_APP_WINDOW
+        winshepherd.sh message green "$1"
+    else
+        play -q ~/local/sounds/deskbell.wav
+    fi
+}
+
 # alias kj="keyjnote -s -D 1000 -t Crossfade -T 100"
 alias impressive="impressive -s -D 1000 -t Crossfade -T 100"
 
@@ -143,6 +162,41 @@ export GIT_EDITOR=${EDITOR}
 
 # export FIGNORE="CVS"
 
+function latexdiff () {
+    # wdiff -n \
+    # -w $'\033[30;43m'"[$1]"$'\033[30;41m ' -x $'\033[0m' \
+    # -y $'\033[30;43m'"[$2]"$'\033[30;42m ' -z $'\033[0m' \
+    # $*
+
+    wdiff -n \
+        -w $'\033[30;41m' -x $'\033[0m' \
+        -y $'\033[30;42m' -z $'\033[0m' \
+        $*
+
+    # | \grep $'\033'"\|section{"
+}
+
+# Looks for the most recent .log and pdflatex + bibtex the
+# corresponding tex file
+
+function rl () {
+    RECENT_LOG=$(find -maxdepth 1 -name "*.log" -type f | head -1)
+    if [[ ${RECENT_LOG} ]]; then
+        FILE=${RECENT_LOG/.log/}
+        pdflatex ${FILE}
+        bibtex ${FILE}
+        pdflatex ${FILE}
+        pdflatex ${FILE}
+        if [[ "$1" == "--xpdf" ]]; then
+            xpdf ${FILE}.pdf
+        fi
+    else
+        echo "Can not find a recent log." >&2
+        return 1
+    fi
+}
+
+
 ######################################################################
 # Functions
 
@@ -162,16 +216,19 @@ function bak () {
 }
 
 function ua () {
+
+    [[ "$1" ]] || ( echo "Universal unarchive: ua <file> [<file> ...]" >&2 && return 1)
+
     while [[ "$1" ]]; do
 
         case "$1" in
 
-            *.tgz|*.tar.gz)
-                tar zxvf "$1"
+            *.tgz|*.tar.gz|*.tbz|*.tar.bz2)
+                tar xvf "$1"
                 ;;
 
             *.rar)
-                unrar x "$1"
+                unrar -kb x "$1"
                 ;;
 
             *.zip)
@@ -288,28 +345,33 @@ function map () {
 ## variables
 
 function pho () {
-    PHO_BIN=/usr/bin/pho
     TEMP=$(mktemp /tmp/pho.XXXXXXX)
-    ${PHO_BIN} "$@" | tee ${TEMP}
+    $(which pho) "$@" | 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/^[^:]*: //")
     PHO_NOTE_R90=$(grep ^"Rotate 90 \(CW\): " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_R180=$(grep ^"Rotate 180: " ${TEMP} | sed -e "s/^[^:]*: //")
     PHO_NOTE_R270=$(grep ^"Rotate -90 \(CCW\): " ${TEMP} | sed -e "s/^[^:]*: //")
+    [[ "${PHO_NOTE_1}" ]] || unset PHO_NOTE_1
+    [[ "${PHO_NOTE_2}" ]] || unset PHO_NOTE_2
+    [[ "${PHO_NOTE_3}" ]] || unset PHO_NOTE_3
+    [[ "${PHO_NOTE_R90}" ]] || unset PHO_NOTE_R90
+    [[ "${PHO_NOTE_R180}" ]] || unset PHO_NOTE_R180
+    [[ "${PHO_NOTE_R270}" ]] || unset PHO_NOTE_R270
     \rm ${TEMP}
 }
 
 # function rotjpeg () {
-    # if [ "$1" == "90" ] || [ "$1" == "180" ] || [ "$1" == "270" ]; then
-        # TEMP=$(mktemp /tmp/rotjpeg.XXXXXX)
-        # 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."
-    # fi
+# if [ "$1" == "90" ] || [ "$1" == "180" ] || [ "$1" == "270" ]; then
+# TEMP=$(mktemp /tmp/rotjpeg.XXXXXX)
+# 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."
+# fi
 # }
 
 ######################################################################
@@ -335,30 +397,47 @@ function dt () {
 [[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history"
 
 function netup () {
+    if [[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]; then
+        echo "There is already interface(s) up." >&2
+        return 1
+    fi
+
+    if [[ $(\ps -C dhclient | tail -n +2) ]]; then
+        echo "There is already a dhcp client running." >&2
+        return 1
+    fi
+
+    if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then
+        echo "There is already a wpa_supplicant running." >&2
+        return 1
+    fi
+
     if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then
-        # If we have no argument and there is a .netup_history, use it
-        ARGS=$(cat ${NETUP_HISTORY})
+        echo "netup <interface>" >&2
+        return 1
+        # # 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} > ${NETUP_HISTORY}
     fi
 
-    if [[ $(ps auxwww | grep dhclient | grep -v grep) ]]; then
-        echo "There is already a dhcp client running." >&2
-        return 1
+    if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then
+        ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
     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
     # explicitely a dns in the /etc/network/interfaces
 
     REMOVE_LOCAL_DNS=/usr/local/bin/remove-local-dns.sh
+    # REMOVE_LOCAL_DNS=${HOME}/sources/scripts/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,8 +451,23 @@ function netdown () {
         # Otherwise, use the standard ifdown
         ARGS="$@"
     fi
-    echo "${VT_GREEN_FG}Executing sudo [ifdown ${ARGS}]${VT_RESET}"
+
+    if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then
+        ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}"
+    fi
+
+    echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}"
     sudo ifdown ${ARGS}
+
+    # if [[ $(\ps -C dhclient | tail -n +2) ]]; then
+    # echo "There is still a dhcp client running." >&2
+    # return 1
+    # fi
+
+    # if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then
+    # echo "There is still a wpa_supplicant running." >&2
+    # return 1
+    # fi
 }
 
 function checkgw () {
@@ -426,7 +520,8 @@ KEPT_COMMANDS=${HOME}/.kept_bash_commands
 
 function keep () {
     if [[ ${KEPT_COMMANDS} ]]; then
-        LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//")
+        LINE="$*"
+        [[ "${LINE}" ]] || LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//")
         echo $LINE
         echo $(date)": "${LINE} >> ${KEPT_COMMANDS}
     else
@@ -448,7 +543,9 @@ function burn () {
             echo "Unknown type of $1" >&2
         fi
     elif [[ -d "$1" ]]; then
-        TMP=$(mktemp /tmp/cdimage.XXXXXX) && \
+        [[ "${TMP_ROOT}" ]] || TMP_ROOT=/tmp/
+        echo "Using ${TMP_ROOT} as temporary directory."
+        TMP=$(mktemp ${TMP_ROOT}/cdimage.XXXXXX) && \
             genisoimage -input-charset iso8859-1 -r -o ${TMP} "$1" && \
             wodim -eject -v dev=${DEVICE} ${TMP}
         rm -f ${TMP}
@@ -474,7 +571,7 @@ function dvd () {
         dvd_device="$1"
         shift
     else
-        dvd_device="/dev/cdrom"
+        dvd_device="/dev/dvd"
     fi
 
     title="1"
@@ -484,22 +581,32 @@ function dvd () {
         shift
     fi
 
+    # -vc ffmpeg12 -vf yadif
+
     mplayer > /dev/null \
         -stop-xscreensaver \
-        -vc ffmpeg12 -quiet \
-        -vf yadif \
-        -alang en \
+        -quiet \
+        -alang en -slang en \
         -softvol -softvol-max 1000 \
-        -dvd-device ${dvd_device} dvd://${title}
-
-# -slang en
-
+        -dvd-device ${dvd_device} $* dvd://${title}
 }
 
 function ripdvd () {
+    if [[ -e "/dev/dvd" ]]; then
+        DVD_DEVICE="/dev/dvd"
+    elif [[ -e "/dev/dvd3" ]]; then
+        DVD_DEVICE="/dev/dvd3"
+    else
+        echo "Can not find the dvd device." >&2
+        return 1
+    fi
+
+    echo "Attemptin to rip from ${DVD_DEVICE}."
+
     mkdir -p ${HOME}/dvds
+
     cd ${HOME}/dvds
-    time dvdbackup -v -M && eject
+    time dvdbackup -i ${DVD_DEVICE} -v -M $* && eject
 }
 
 alias ripcd=abcde
@@ -554,30 +661,30 @@ function mksmall () {
                 echo "The file ${DEST_DIR}/$i already exists."
             else
 
-                orientation=$(exif $i \
-                    | grep ^Orientation \
-                    | head -1 \
-                    | sed -e "s/^[^|]*|//" \
-                    | sed -e "s/ *$//")
+                # orientation=$(exif $i \
+                # | grep ^Orientation \
+                # | head -1 \
+                # | sed -e "s/^[^|]*|//" \
+                # | sed -e "s/ *$//")
 
-                case ${orientation} in
-                    ""|"top - left")
-                        rotation_cmd=""
-                        ;;
+                # case ${orientation} in
+                # ""|"top - left")
+                # rotation_cmd=""
+                # ;;
 
-                    "right - top")
-                        rotation_cmd="-rotate 90"
-                        ;;
+                # "right - top")
+                # rotation_cmd="-rotate 90"
+                # ;;
 
-                    "left - bottom")
-                        rotation_cmd="-rotate 270"
-                        ;;
+                # "left - bottom")
+                # rotation_cmd="-rotate 270"
+                # ;;
 
-                    *)
-                        rotation_cmd=""
-                        echo "Unknown orientation \"${orientation}\" !"
-                        ;;
-                esac
+                # *)
+                # rotation_cmd=""
+                # echo "Unknown orientation \"${orientation}\" !"
+                # ;;
+                # esac
 
                 if [[ $(file ${i/%.*/}.* | grep -E movie) ]] ; then
                     CAPTION_PARAMS="-font FreeSans-Bold -pointsize 32 -fill green -annotate +10+32 Video"
@@ -636,73 +743,27 @@ function git-fm () {
     echo "Visited ${NB_SUBDIR} directories."
 }
 
-######################################################################
-# Commits all directories under git
-
-alias git-ca="echo Are you sure?"
-
-function git-ca () {
-    ORIGINAL_PWD=${PWD}
-    UNCOMMITTED=""
-    for d in $(find ${PWD} -name ".git"  | sed -e "s/\.git$//"); do
-        cd $d
-        NB_MODIFIED=$(git status | grep modified | wc -l)
-        if [[ ${NB_MODIFIED} -gt 0 ]]; then
-            if [[ $(pwd) =~ ${NO_AUTOMATIC_GIT_COMMIT} ]]; then
-                UNCOMMITTED="${UNCOMMITTED} $(pwd)"
+function vcup () {
+    if [[ "$1" ]]; then
+        CURRENT=${PWD}
+        while [[ "$1" ]]; do
+            cd ${CURRENT}
+            cd $1
+            if [[ -d ".git" ]]; then
+                echo "${PWD} is under GIT"
+                git pull
+            elif [[ -d ".svn" ]]; then
+                echo "${PWD} is under SVN"
+                svn update
             else
-                echo $(pwd)" (${NB_MODIFIED} modified file(s))"
-                git commit -a -m "Automatic commit" | grep -v ^#
+                echo "No known versioning system."
             fi
-            # git gc
-        fi
-    done
-
-    cd ${ORIGINAL_PWD}
-
-    if [[ ${UNCOMMITTED} ]]; then
-        echo "** WARNING: Did not automatically commit${UNCOMMITTED}"
-    fi
-}
-
-######################################################################
-# Backups all git directories into an encrypted backup file located
-# either on the usb key or the SD card (in that order) if they can be
-# mounted.
-
-function git-backup () {
-
-    BACKUPDIR=/mnt/key
-
-    mount ${BACKUPDIR} 2> /dev/null
-
-    if [[ ! $(mount | grep ${BACKUPDIR}) ]]; then
-        BACKUPDIR=/mnt/sd
-        mount ${BACKUPDIR}
-    fi
-
-    if [[ $(mount | grep ${BACKUPDIR}) ]]; then
-        echo "Mounted ${BACKUPDIR}"
+            shift
+        done
+        cd ${CURRENT}
     else
-        echo "Could not mount the backup directory"
-        return 1
+        vcup .
     fi
-
-    RESULT=${BACKUPDIR}/gitbackup-$(date +%F-%H%M%S).tgz.mc
-
-    tar zcvf - $(find ${HOME}/ -name .git) \
-        | mcrypt -f ${HOME}/private/mcrypt.key > ${RESULT}
-
-    if [[ -f ${RESULT} ]]; then
-        ls -lh ${RESULT}
-    else
-        echo "Could not create the backup!"
-        return 1
-    fi
-
-    sync
-
-    umount ${BACKUPDIR} && echo "Umounted ${BACKUPDIR}"
 }
 
 ######################################################################
@@ -737,24 +798,24 @@ if [ "${CONSOLE}" == "yes" ]; then
     PS1=""
 else
 
-# If the login is a standard one (as specified in
-# IGNORED_PROMPT_LOGIN, which is set in the private bash file), do not
-# show it. I have IGNORED_PROMPT_LOGIN="^fleuret$".
+    # If the login is a standard one (as specified in
+    # IGNORED_PROMPT_LOGIN, which is set in the private bash file), do not
+    # show it. I have IGNORED_PROMPT_LOGIN="^fleuret$".
 
     if [ ! ${IGNORED_PROMPT_LOGIN} ] || [[ ! ${USER} =~ ${IGNORED_PROMPT_LOGIN} ]]; then
         IDENT="${USER}"
     fi
 
-# If the display is not the main one, make the assumption that the
-# shell is not running on the localhost, and show the hostname
+    # If the display is not the main one, make the assumption that the
+    # shell is not running on the localhost, and show the hostname
 
     [ "${DISPLAY}" != ":0.0" ] && IDENT="${IDENT}@\h"
 
-# If there is the login or the hostname, add a ":" to the prompt
+    # If there is the login or the hostname, add a ":" to the prompt
 
     [ "${IDENT}" ] && IDENT="${IDENT}:"
 
-# If we are root, show that in red
+    # If we are root, show that in red
 
     if [[ ${USER} == "root" ]]; then
         PS1="\[${VT_RED_BG}${VT_WHITE_FG}\]${IDENT}\w\[${VT_RESET}\] "
@@ -762,15 +823,15 @@ else
         PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] "
     fi
 
-# In an xterm, show the hostname and path in the title bar, highlight
-# the prompt
+    # In an xterm, show the hostname and path in the title bar, highlight
+    # the prompt
 
     # [ "${TERMS_WITH_BAR}" ] || TERMS_WITH_BAR="^xterm|screen$"
 
     # if [[ "${TERM}" =~ "${TERMS_WITH_BAR}" ]]; then
-        # PS1="\[${VT_SET_TITLE}shell@\h (\w)${VT_END_TITLE}${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
+    # PS1="\[${VT_SET_TITLE}shell@\h (\w)${VT_END_TITLE}${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
     # else
-        # PS1="\[${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
+    # PS1="\[${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] "
     # fi
 
 fi
@@ -824,58 +885,14 @@ alias dus='dus -f -i'
 #
 # git clone http://fleuret.org/git/finddup/
 
-# alias finddup='finddup -p0d'
 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"'
+source bash-selector.sh --hist --cd
 
 ######################################################################
 # And we avoid to put in the history the use of the selector, which we
@@ -894,17 +911,37 @@ function selector-printer () {
     lpq
 }
 
+######################################################################
+# A ls with memory to notice what files have been added/removed from
+# the current directory
+
+function lsn () {
+    LSN_MEMORY=".lsn-mem"
+    if  [[ $1 == "--mem" ]]; then
+        \ls > ${LSN_MEMORY}
+    else
+        if [[ -f ${LSN_MEMORY} ]]; then
+            comm -1 -3 ${LSN_MEMORY} <(\ls)
+            comm -2 -3 ${LSN_MEMORY} <(\ls) | while read line; do
+                echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)"
+            done
+        else
+            echo "No lsn memory here." >&2
+        fi
+    fi
+}
+
 ######################################################################
 
 function prompt_command () {
-# save the history after every command to avoid loosing some when
-# multiple shells are open
+    # save the history after every command to avoid loosing some when
+    # multiple shells are open
     history -a
-# load the saved history
+    # load the saved history
     history -n
-# and the local histories system defined above
+    # and the local histories system defined above
     keep_local_history
-# and the history cue
+    # and the history cue
     histfile_cue
 }