From 1e890fe2d9174c9885320fc48228a43b8154f87d Mon Sep 17 00:00:00 2001 From: Francois Fleuret Date: Tue, 11 Sep 2012 08:38:14 +0200 Subject: [PATCH] Update. --- bashrc | 111 +++++++++++++++++++++++++++++++++++---------------- clean.sh | 8 ++-- dns323-op.sh | 8 ++-- gma.sh | 6 ++- html2text.sh | 24 +++++++---- 5 files changed, 106 insertions(+), 51 deletions(-) diff --git a/bashrc b/bashrc index f3d033a..c0089c4 100644 --- a/bashrc +++ b/bashrc @@ -116,6 +116,21 @@ 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" @@ -147,6 +162,20 @@ 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{" +} + ###################################################################### # Functions @@ -456,7 +485,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 +508,8 @@ function burn () { echo "Unknown type of $1" >&2 fi elif [[ -d "$1" ]]; then - TMP=$(mktemp /tmp/cdimage.XXXXXX) && \ + [[ "${TMP_ROOT}" ]] || TMP_ROOT=/tmp/ + 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 +535,7 @@ function dvd () { dvd_device="$1" shift else - dvd_device="/dev/cdrom" + dvd_device="/dev/dvd" fi title="1" @@ -514,22 +545,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 +625,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/ *$//") - - case ${orientation} in - ""|"top - left") - rotation_cmd="" - ;; - - "right - top") - rotation_cmd="-rotate 90" - ;; - - "left - bottom") - rotation_cmd="-rotate 270" - ;; - - *) - rotation_cmd="" - echo "Unknown orientation \"${orientation}\" !" - ;; - esac + # orientation=$(exif $i \ + # | grep ^Orientation \ + # | head -1 \ + # | sed -e "s/^[^|]*|//" \ + # | sed -e "s/ *$//") + + # case ${orientation} in + # ""|"top - left") + # rotation_cmd="" + # ;; + + # "right - top") + # rotation_cmd="-rotate 90" + # ;; + + # "left - bottom") + # rotation_cmd="-rotate 270" + # ;; + + # *) + # 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" diff --git a/clean.sh b/clean.sh index 496d46f..b6767a3 100755 --- a/clean.sh +++ b/clean.sh @@ -32,12 +32,12 @@ for i in "nav:tex" "snm:tex" "toc:tex" "blg:tex" \ for f in *.$PRODUCED; do ORIGINAL=${f/.$PRODUCED/.$SOURCE} if [ -f "${ORIGINAL}" ]; then - if [ "${f}" -nt "${ORIGINAL}" ]; then + # if [ "${f}" -nt "${ORIGINAL}" ]; then echo "Moving file $f to ${TRASH} ($ORIGINAL exists)" mv $f ${TRASH} - else - echo "File $f is older than $ORIGINAL. Keeping both." - fi + # else + # echo "File $f is older than $ORIGINAL. Keeping both." + # fi fi done done diff --git a/dns323-op.sh b/dns323-op.sh index af7a5ed..08e3922 100755 --- a/dns323-op.sh +++ b/dns323-op.sh @@ -58,7 +58,8 @@ function rm_temp () { function authentify_on_dns323 () { if [[ ! ${already_authentified} ]]; then echo "Authentifying on ${DNS323_HOSTNAME}." - curl -s > /dev/null \ + curl > /dev/null \ + -s \ -L http://${DNS323_HOSTNAME}/goform/formLogin \ -d "f_LOGIN_NAME=admin&f_LOGIN_PASSWD=${DNS323_ADMIN_PASSWORD}&f_login_type=0" \ || (echo "Failed." >&2 && exit 1) @@ -94,7 +95,7 @@ EOF trap rm_temp SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM ERR if [[ ${DNS323_HOSTNAME} ]] && \ - [[ ${DNS323_ADMIN_PASSWORD} ]]; then + [[ ${DNS323_ADMIN_PASSWORD} ]]; then while [[ $1 ]]; do @@ -186,7 +187,8 @@ if [[ ${DNS323_HOSTNAME} ]] && \ check_unmounted - curl -s > /dev/null \ + curl > /dev/null \ + -s \ -L http://${DNS323_HOSTNAME}/goform/System_restart \ -d "" diff --git a/gma.sh b/gma.sh index e266737..6b0c518 100755 --- a/gma.sh +++ b/gma.sh @@ -20,7 +20,7 @@ set -e function usage () { - echo "gma.sh [--body] [--keepspam] [--subject|--from|--to|--fromto] []" + echo "gma.sh [--body] [--keepspam] [--subject|--from|--to|--fromto|--sender] []" } RESULT_MBOX="/tmp/gma" @@ -71,6 +71,10 @@ while [[ $1 ]]; do RE_PREFIX="^(From|To):.*" ;; + "--sender") + RE_PREFIX="^Sender:.*" + ;; + "--subject") RE_PREFIX="^Subject:.*" ;; diff --git a/html2text.sh b/html2text.sh index dd9dd0a..fe10cc0 100755 --- a/html2text.sh +++ b/html2text.sh @@ -1,13 +1,21 @@ #!/bin/bash -################################################################## -# START_IP_HEADER # -# # -# Written by Francois Fleuret # -# Contact for comments & bug reports # -# # -# END_IP_HEADER # -################################################################## +######################################################################### +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the version 3 of the GNU General Public License # +# as published by the Free Software Foundation. # +# # +# This program is distributed in the hope that it will be useful, but # +# WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # +# General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +# Written by and Copyright (C) Francois Fleuret # +# Contact for comments & bug reports # +######################################################################### set -e -- 2.20.1