X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=c0089c4020de395e8f9b9459bd1aa3b5cc701103;hb=1e890fe2d9174c9885320fc48228a43b8154f87d;hp=dbacd63cc076ae9d0478c1b7379efa3dde523cf1;hpb=d2ed89b93711aa0a8a9dea4ef66ff9c9c8483b3c;p=scripts.git diff --git a/bashrc b/bashrc index dbacd63..c0089c4 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 @@ -112,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" @@ -143,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 @@ -166,8 +199,8 @@ function ua () { case "$1" in - *.tgz|*.tar.gz) - tar zxvf "$1" + *.tgz|*.tar.gz|*.tbz|*.tar.bz2) + tar xvf "$1" ;; *.rar) @@ -288,15 +321,20 @@ function map () { ## variables function pho () { - PHO_BIN=$(which 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} } @@ -335,22 +373,34 @@ 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 " >&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 - fi - - if [[ -f "${HOME}/private/interfaces" ]]; then - ARGS="-i ${HOME}/private/interfaces ${ARGS}" + if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then + ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" fi echo "Executing ${VT_GREEN_FG}[sudo ifup ${ARGS}]${VT_RESET}" @@ -377,8 +427,8 @@ function netdown () { ARGS="$@" fi - if [[ -f "${HOME}/private/interfaces" ]]; then - ARGS="-i ${HOME}/private/interfaces ${ARGS}" + if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then + ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" fi echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}" @@ -435,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 @@ -457,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} @@ -483,7 +535,7 @@ function dvd () { dvd_device="$1" shift else - dvd_device="/dev/cdrom" + dvd_device="/dev/dvd" fi title="1" @@ -493,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 @@ -563,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/ *$//") + # 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" @@ -841,7 +903,7 @@ alias finddup='finddup -p' # # git clone http://fleuret.org/git/selector/ -. bash-selector.sh +source bash-selector.sh --hist --cd ###################################################################### # And we avoid to put in the history the use of the selector, which we