X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=c0089c4020de395e8f9b9459bd1aa3b5cc701103;hb=1e890fe2d9174c9885320fc48228a43b8154f87d;hp=3c4123e9246ab0b8ca6f8300b564af6ed09f8f3d;hpb=04affe379943dc18a73e805fed5c318daf7cce01;p=scripts.git diff --git a/bashrc b/bashrc index 3c4123e..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 @@ -90,7 +94,9 @@ export LESS_TERMCAP_me=${VT_RESET} # This prevents ^S from freezing the shell -stty -ixon +# stty -ixon + +ulimit -c unlimited alias ..='cd ..' alias -- -='cd -' @@ -103,9 +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 --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' + +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" @@ -115,15 +140,14 @@ alias impressive="impressive -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' @@ -138,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 @@ -156,6 +194,33 @@ function bak () { done } +function ua () { + while [[ "$1" ]]; do + + case "$1" in + + *.tgz|*.tar.gz|*.tbz|*.tar.bz2) + tar xvf "$1" + ;; + + *.rar) + unrar x "$1" + ;; + + *.zip) + unzip "$1" + ;; + + *) + echo "Unknown file extension $1" + ;; + esac + + shift + + done +} + # Create a dir and cd there function mcd () { @@ -251,24 +316,25 @@ function map () { done } -function d () { - wget -O - $1 -} - ###################################################################### ## A version of pho which stores the image numbers in environment ## 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} } @@ -307,16 +373,37 @@ 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 - echo "${VT_GREEN_FG}Running [sudo ifup ${ARGS}]${VT_RESET}" + if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then + ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" + fi + + 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 @@ -325,7 +412,7 @@ function netup () { 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 "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" sudo ${REMOVE_LOCAL_DNS} 192.168 fi } @@ -339,7 +426,12 @@ function netdown () { # Otherwise, use the standard ifdown ARGS="$@" fi - echo "${VT_GREEN_FG}Running 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} } @@ -393,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 @@ -415,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} @@ -441,7 +535,7 @@ function dvd () { dvd_device="$1" shift else - dvd_device="/dev/cdrom" + dvd_device="/dev/dvd" fi title="1" @@ -451,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 @@ -521,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" @@ -606,6 +710,8 @@ function git-fm () { ###################################################################### # Commits all directories under git +alias git-ca="echo Are you sure?" + function git-ca () { ORIGINAL_PWD=${PWD} UNCOMMITTED="" @@ -793,53 +899,11 @@ alias dus='dus -f -i' 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 -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 CD_HISTORY - -[[ "${CD_HISTORY}" ]] || CD_HISTORY=${HOME}/.selector-cd-history - -function selector-cd-search () { - PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX) - selector -l 10000 -d -i -o ${PATH_TEMP} -q ${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}!~!" >> ${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-search\C-m"' +source bash-selector.sh --hist --cd ###################################################################### # And we avoid to put in the history the use of the selector, which we @@ -864,6 +928,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