X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=scripts.git;a=blobdiff_plain;f=bashrc;h=067fdf5fe309a32daa1c57338e3ed617978de612;hp=f3d033aa8c266aa4a683a091725ed4829a5d286e;hb=d010af75293885a1787ac459081df82f7bcc977b;hpb=0fb8308d2117d02eedcd003721606dea8bb796dc diff --git a/bashrc b/bashrc index f3d033a..067fdf5 100644 --- a/bashrc +++ b/bashrc @@ -104,18 +104,33 @@ alias rm='rm -i' alias mv='mv -i' # alias chmod='chmod -v' alias chmod='chmod -c' -alias cp='cp -i' +alias cp='cp -i -v' alias rd=rmdir -alias md='mkdir -v' +alias md='mkdir -pv' alias ps='ps uxaf' alias df='df -hT --sync' -alias grep='grep -i -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" @@ -125,18 +140,18 @@ alias impressive="impressive -s -D 1000 -t Crossfade -T 100" if [ -e "${HOME}/.dircolors" ]; then eval $(dircolors "${HOME}/.dircolors") - 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 ls='ls -p --group-directories-first --color' + alias lt='ls -p --color -gohtr --time-style="+%Y %b %d %H:%M"' + alias ll='ls -p --color -goh --time-style="+%Y %b %d %H:%M"' + alias lll='ls -p --color -lth' + alias l='ls -p --color -I "*~" -I "*.o"' alias less='less -R' else - 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"' + alias ls='ls -p --group-directories-first' + alias lt='ls -p -gohtr --time-style="+%Y %b %d %H:%M"' + alias ll='ls -p -goh --time-style="+%Y %b %d %H:%M"' + alias lll='ls -p -lth' + alias l='ls -p -I "*~" -I "*.o"' fi export EDITOR=emacsclient @@ -147,6 +162,62 @@ 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=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1) + + if [[ ${RECENT_LOG} ]]; then + FILEBASE="${RECENT_LOG/.log/}" + + if [[ -f "${FILEBASE}.tex" ]]; then + + pdflatex "${FILEBASE}" + bibtex "${FILEBASE}" + pdflatex "${FILEBASE}" + pdflatex "${FILEBASE}" + + if [[ "$1" ]]; then + if [[ "$1" == "-v" ]] || [[ "$1" == "--view" ]]; then + xpdf "${FILEBASE}.pdf" + elif [[ "$1" == "-p" ]] || [[ "$1" == "--print" ]]; then + lpr "${FILEBASE}.pdf" + else + echo "Usage: rl [-v|--view] [-p|--print]" >&2 + echo "Unknown option $1" >&2 + return 1 + fi + fi + + else + + echo "Can not find a tex file corresponding to the most recent log (${RECENT_LOG/.log/})." >&2 + return 1 + + fi + + else + echo "Can not find a recent log." >&2 + return 1 + fi +} + + ###################################################################### # Functions @@ -166,6 +237,9 @@ function bak () { } function ua () { + + [[ "$1" ]] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) + while [[ "$1" ]]; do case "$1" in @@ -175,7 +249,7 @@ function ua () { ;; *.rar) - unrar x "$1" + unrar -kb x "$1" ;; *.zip) @@ -226,7 +300,15 @@ function cdt () { return 1 fi else - cd $(mktemp -d /tmp/tmp.XXXXXX) + dir=$(mktemp -d /tmp/tmp.XXXXXX) + link=/tmp/tmp + if [[ -h ${link} ]]; then + \rm ${link} + fi + if [[ ! -a ${link} ]]; then + ln -s ${dir} ${link} + fi + cd ${dir} fi } @@ -234,37 +316,21 @@ alias t='cd /tmp' function trash () { TRASH=$(date +/tmp/trash-%Y-%b-%d-%Hh) + LINK=/tmp/trash - if [[ -d ${TRASH} ]]; then - echo "Re-use ${TRASH}" - else - mkdir ${TRASH} - echo "Created ${TRASH}" - fi + mkdir -p ${TRASH} + + [[ -h ${LINK} ]] && \rm ${LINK} + [[ ! -f ${LINK} ]] && ln -s ${TRASH} ${LINK} mv "$@" ${TRASH} echo "Trashed $@" } -# alias trash=trash.sh - function mmsget () { 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 -} - ###################################################################### # http://www.reddit.com/r/linux/comments/akt3j/a_functional_programming_style_map_function_for/ @@ -309,18 +375,6 @@ function pho () { \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 -# } - ###################################################################### ## A version of date that shows the time at home if TZ is set @@ -344,6 +398,23 @@ function dt () { [[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history" function netup () { + WIFI_INTERFACE=wlan0 + + if [[ $1 == "--scan" ]]; then + if [[ ! $(\ifconfig -s | grep ${WIFI_INTERFACE}) ]]; then + sudo ifconfig ${WIFI_INTERFACE} up + UPPED_WIFI=1 + fi + + sudo iwlist ${WIFI_INTERFACE} scan|grep ESS\|Quali\|Encry + + if [[ ${UPPED_WIFI} ]]; then + sudo ifconfig ${WIFI_INTERFACE} down + fi + + return 0 + fi + if [[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]; then echo "There is already interface(s) up." >&2 return 1 @@ -381,6 +452,7 @@ function netup () { # 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 "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" @@ -404,6 +476,16 @@ function netdown () { 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 () { @@ -431,7 +513,7 @@ function lr () { # cd and ls into a directory # [from http://www.oreillynet.com/onlamp/blog/2007/01/whats_in_your_bash_history.html] -# function c () { cd "$@" && lr; } +function c () { cd "$@" && lr; } ###################################################################### # You can change the xterm background color on the fly! @@ -456,7 +538,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 @@ -478,7 +561,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} @@ -504,7 +589,7 @@ function dvd () { dvd_device="$1" shift else - dvd_device="/dev/cdrom" + dvd_device="/dev/dvd" fi title="1" @@ -514,22 +599,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 @@ -584,30 +679,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" @@ -666,73 +761,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}" - else - echo "Could not mount the backup directory" - return 1 - 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} + shift + done + cd ${CURRENT} else - echo "Could not create the backup!" - return 1 + vcup . fi - - sync - - umount ${BACKUPDIR} && echo "Umounted ${BACKUPDIR}" } ###################################################################### @@ -767,24 +816,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}\] " @@ -792,15 +841,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 @@ -854,7 +903,6 @@ alias dus='dus -f -i' # # git clone http://fleuret.org/git/finddup/ -# alias finddup='finddup -p0d' alias finddup='finddup -p' ###################################################################### @@ -881,17 +929,42 @@ 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-state" + if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]]; then + \ls -pa | sort > ${LSN_MEMORY} + echo "State updated." >&2 + elif [[ -n "$1" ]]; then + echo "lsn [--mem|-m]" >&2 + return 1 + else + if [[ -f ${LSN_MEMORY} ]]; then + comm -1 -3 ${LSN_MEMORY} <(\ls -pa | sort) + comm -2 -3 ${LSN_MEMORY} <(\ls -pa | sort) | while read line; do + echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)" + done + else + echo "No lsn state here." >&2 + return 1 + 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 }