X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=72edf8370482356b697caf0622b7b9c059ebd21a;hb=e29d555e322a584bb384d02e2b444973b85b16f5;hp=b4da27d4d5f70dea3c001ddede5bfea5c950ef86;hpb=ae7f4b84ee0a0d6302f98d48d1720b255cf3ec40;p=scripts.git diff --git a/bashrc b/bashrc index b4da27d..72edf83 100644 --- a/bashrc +++ b/bashrc @@ -48,7 +48,7 @@ shopt -s histappend # interactive mode. This should maybe be done more properly through # using different .bash_profile and .bash_login -[[ ${TERM} == "dumb" ]] || [ ! -t 0 ] && return +[ ${TERM} == "dumb" ] || [ ! -t 0 ] && return # Remove the annoying beeps in console @@ -108,7 +108,8 @@ alias cp='cp -i -v' alias rd=rmdir alias md='mkdir -pv' alias ps='ps uxaf' -alias df='df -hT --sync' +alias df='df -hT' +# alias df='df -hT --sync' alias grep='grep -i -E --color=auto' alias find='ionice -c3 find' alias pd=pushd @@ -122,7 +123,7 @@ function nh () { } function ding () { - if [[ $1 && $(which winshepherd.sh) ]]; then + if [ $1 ] && which winshepherd.sh; then play -q ~/local/sounds/deskbell.wav & unset E_APP_WINDOW winshepherd.sh message green "$1" @@ -131,13 +132,8 @@ function ding () { fi } -# alias kj="keyjnote -s -D 1000 -t Crossfade -T 100" alias impressive="impressive -s -D 1000 -t Crossfade -T 100" -# alias fdupes='fdupes -r .' - -# ls colors - if [ -e "${HOME}/.dircolors" ]; then eval $(dircolors "${HOME}/.dircolors") alias ls='ls -p --group-directories-first --color' @@ -163,17 +159,10 @@ 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 @@ -182,20 +171,20 @@ function latexdiff () { function rl () { RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1) - if [[ ${RECENT_LOG} ]]; then + if [ ${RECENT_LOG} ]; then FILEBASE="${RECENT_LOG/.log/}" - if [[ -f "${FILEBASE}.tex" ]]; then + if [ -f "${FILEBASE}.tex" ]; then pdflatex "${FILEBASE}" bibtex "${FILEBASE}" pdflatex "${FILEBASE}" pdflatex "${FILEBASE}" - if [[ "$1" ]]; then - if [[ "$1" == "-v" ]] || [[ "$1" == "--view" ]]; then + if [ "$1" ]; then + if [ "$1" == "-v" ] || [ "$1" == "--view" ]; then xpdf "${FILEBASE}.pdf" - elif [[ "$1" == "-p" ]] || [[ "$1" == "--print" ]]; then + elif [ "$1" == "-p" ] || [ "$1" == "--print" ]; then lpr "${FILEBASE}.pdf" else echo "Usage: rl [-v|--view] [-p|--print]" >&2 @@ -221,6 +210,20 @@ function rl () { ###################################################################### # Functions +# http://www.reddit.com/r/linux/comments/2cgu5k/a_handy_little_script_for_interacting_with_your/ +function clip () { + if [ -t 0 ] && [ -z "$1" ]; then + # output contents of clipboard + xclip -out -selection clipboard || exit 1 + elif [ "$1" ]; then + # copy file contents to clipboard + xclip -in -selection clipboard < "$1" || exit 1 + else + # copy stdin to clipboard + xclip -in -selection clipboard <&0 || exit 1 + fi +} + # Find a file whose name contains a substring function fn () { @@ -230,7 +233,7 @@ function fn () { } function bak () { - while [[ "$1" ]]; do + while [ "$1" ]; do cp "$1" "$1".bak shift done @@ -238,9 +241,9 @@ function bak () { function ua () { - [[ "$1" ]] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) + [ "$1" ] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) - while [[ "$1" ]]; do + while [ "$1" ]; do case "$1" in *.tgz|*.tar.gz|*.tbz|*.tar.bz2) @@ -275,13 +278,13 @@ function mcd () { # Capture the screen in a dated png function cap () { - if [[ $2 ]]; then + if [ $2 ]; then name=$2 else name="capture-$(date +%s).png" fi echo "Waiting $1 s and saving to ${name}." - [[ "$1" ]] && sleep "$1" + [ "$1" ] && sleep "$1" echo "Please click on the window to capture." xwd | convert - ${name} \ls -l ${name} @@ -291,8 +294,8 @@ function cap () { # arguments, do not create one and CD in the most recent instead function cdt () { - if [[ "$1" ]]; then - if [[ "$1" == "-" ]]; then + if [ "$1" ]; then + if [ "$1" == "-" ]; then cd $(\ls -td /tmp/tmp.?????? | head -1) else echo "USAGE: cdt [-]" >&2 @@ -301,10 +304,10 @@ function cdt () { else dir=$(mktemp -d /tmp/tmp.XXXXXX) link=/tmp/tmp - if [[ -h ${link} ]]; then + if [ -h ${link} ]; then \rm ${link} fi - if [[ ! -a ${link} ]]; then + if [ ! -a ${link} ]; then ln -s ${dir} ${link} fi cd ${dir} @@ -319,39 +322,14 @@ function trash () { mkdir -p ${TRASH} - [[ -h ${LINK} ]] && \rm ${LINK} - [[ ! -f ${LINK} ]] && ln -s ${TRASH} ${LINK} + [ -h ${LINK} ] && \rm ${LINK} + + [ ! -f ${LINK} ] && ln -s ${TRASH} ${LINK} mv "$@" ${TRASH} echo "Trashed $@" } -function mmsget () { - mplayer "$1" -dumpstream -dumpfile $(basename "$1") -} - -###################################################################### -# http://www.reddit.com/r/linux/comments/akt3j/a_functional_programming_style_map_function_for/ - -function map () { - local command i rep - if [ $# -lt 2 ] || [[ ! "$@" =~ :[[:space:]] ]];then - echo "Invalid syntax." >&2; return 1 - fi - until [[ "$1" =~ : ]]; do - command="$command $1"; shift - done - command="$command ${1%:}"; shift - for i in "$@"; do - if [[ $command =~ \{\} ]];then - rep="${command//\{\}/\"$i\"}" - eval "${rep//\\/\\\\}" - else - eval "${command//\\/\\\\} \"${i//\\/\\\\}\"" - fi - done -} - ###################################################################### ## A version of pho which stores the image numbers in environment ## variables @@ -365,12 +343,12 @@ function pho () { 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 + [ "${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} } @@ -379,7 +357,7 @@ function pho () { function dt () { echo "Local: $(date)" - if [[ ${TZ} ]]; then + if [ ${TZ} ]; then unset TZ echo "Home: $(date)" fi @@ -394,42 +372,45 @@ function dt () { ## When invoked without an argument netdown removes the last interface ## which was netuped -[[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history" +[ ${NETUP_HISTORY} ] || NETUP_HISTORY="${HOME}/.netup_history" function netup () { - WIFI_INTERFACE=wlan0 + local upped_wifi + + [ "${WIFI_INTERFACE}" ] || WIFI_INTERFACE=wlan0 - if [[ $1 == "--scan" ]]; then - if [[ ! $(\ifconfig -s | grep ${WIFI_INTERFACE}) ]]; then + if [ "$1" == "--scan" ]; then + if ifconfig -s | grep -v -q ${WIFI_INTERFACE}; then sudo ifconfig ${WIFI_INTERFACE} up - UPPED_WIFI=1 + upped_wifi=1 fi sudo iwlist ${WIFI_INTERFACE} scan | \grep -E 'ESS|Quali|Encry' | sed -e 's/^[ \t]*//' - if [[ ${UPPED_WIFI} ]]; then + if [ ${upped_wifi} ]; then sudo ifconfig ${WIFI_INTERFACE} down + unset upped_wifi fi return 0 fi - if [[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]; then - echo "There is already interface(s) up." >&2 + if \ifconfig -s | grep -q -v ^'(Iface|lo) '; then + echo "There is/are already interface(s) up." >&2 return 1 fi - if [[ $(\ps -C dhclient | tail -n +2) ]]; then + if \ps h -C dhclient | grep -q .; then echo "There is already a dhcp client running." >&2 return 1 fi - if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then + if \ps h -C wpa_supplicant | grep -q .; then echo "There is already a wpa_supplicant running." >&2 return 1 fi - if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then + if [ ! "$@" ] && [ -s ${NETUP_HISTORY} ]; then echo "netup " >&2 return 1 # # If we have no argument and there is a .netup_history, use it @@ -440,7 +421,7 @@ function netup () { echo ${ARGS} > ${NETUP_HISTORY} fi - if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then + if [ "${PRIVATE_INTERFACE_DEFINITION}" ]; then ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" fi @@ -453,14 +434,14 @@ function netup () { 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 + if [ -x ${REMOVE_LOCAL_DNS} ]; then echo "Executing ${VT_GREEN_FG}[sudo ${REMOVE_LOCAL_DNS} 192.168]${VT_RESET}" sudo ${REMOVE_LOCAL_DNS} 192.168 fi } function netdown () { - if [[ ! "$@" ]] && [[ -s ${NETUP_HISTORY} ]]; then + if [ ! "$@" ] && [ -s ${NETUP_HISTORY} ]; then # If there are no arguments and there is a .netup_history, get the # interface from it ARGS=$(tail -1 ${NETUP_HISTORY} | sed -e "s/=.*$//") @@ -469,9 +450,7 @@ function netdown () { ARGS="$@" fi - if [[ -n "${PRIVATE_INTERFACE_DEFINITION}" ]]; then - ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" - fi + [ "${PRIVATE_INTERFACE_DEFINITION}" ] && ARGS="-i ${PRIVATE_INTERFACE_DEFINITION} ${ARGS}" echo "Executing sudo ${VT_GREEN_FG}[ifdown ${ARGS}]${VT_RESET}" sudo ifdown ${ARGS} @@ -489,7 +468,7 @@ function netdown () { function checkgw () { GW=$(route -n | grep ^0.0.0.0 | awk '{print $2}') - if [[ -n "${GW}" ]]; then + if [ "${GW}" ]; then ping ${GW} else echo "Can not find a getaway." >&2 @@ -508,12 +487,6 @@ function lr () { cut -b1-${WIDTH} } -###################################################################### -# 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; } - ###################################################################### # You can change the xterm background color on the fly! @@ -526,7 +499,7 @@ function setxtermbg () { function shuffle () { SEED=$1 - [[ $SEED ]] || SEED=0 + [ $SEED ] || SEED=0 awk 'BEGIN{srand('${SEED}')} { print rand()" "$0 }' | sort -g | sed -e "s/^[0-9\.e\-]* //" } @@ -536,11 +509,22 @@ function shuffle () { KEPT_COMMANDS=${HOME}/.kept_bash_commands function keep () { - if [[ ${KEPT_COMMANDS} ]]; then - LINE="$*" - [[ "${LINE}" ]] || LINE=$(history | tail -2 | head -1 | sed -e "s/^[0-9 ]*//") - echo $LINE - echo $(date)": "${LINE} >> ${KEPT_COMMANDS} + if [ ${KEPT_COMMANDS} ]; then + TOKEEP=$(mktemp /tmp/keep.XXXXXX) + if [ "$*" ]; then + echo "$*" > ${TOKEEP} + else + selector -b -i -d -l ${HISTSIZE} -o "${TOKEEP}" <(history) + fi + + if [ -s "${TOKEEP}" ]; then + echo $(date)": "$(cat ${TOKEEP}) >> ${KEPT_COMMANDS} + cat "${TOKEEP}" + else + echo "No command stored!" + fi + + \rm ${TOKEEP} else echo "You have to set \$KEPT_COMMANDS" fi @@ -550,17 +534,17 @@ function keep () { # I sometime burn CDs and DVDs function burn () { - DEVICE="/dev/cdrw" - if [[ ! "$1" ]]; then + DEVICE="/dev/cdrw1" + if [ ! "$1" ]; then echo "burn " >&2 - elif [[ -f "$1" ]]; then + elif [ -f "$1" ]; then if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then wodim -eject -v dev=${DEVICE} "$1" else echo "Do not know what to do with $1" >&2 fi - elif [[ -d "$1" ]]; then - [[ "${TMP_ROOT}" ]] || TMP_ROOT=/tmp/ + elif [ -d "$1" ]; then + [ "${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" && \ @@ -584,7 +568,7 @@ function dvd () { echo " / * Volume" echo - if [[ "$1" ]]; then + if [ "$1" ]; then dvd_device="$1" shift else @@ -593,7 +577,7 @@ function dvd () { title="1" - if [[ "$1" ]]; then + if [ "$1" ]; then title=$1 shift fi @@ -605,13 +589,13 @@ function dvd () { -quiet \ -alang en -slang en \ -softvol -softvol-max 1000 \ - -dvd-device ${dvd_device} $* dvd://${title} + -dvd-device ${dvd_device} ${MPLAYER_OPTIONS} dvd://${title} } function ripdvd () { - if [[ -e "/dev/dvd" ]]; then + if [ -e "/dev/dvd" ]; then DVD_DEVICE="/dev/dvd" - elif [[ -e "/dev/dvd3" ]]; then + elif [ -e "/dev/dvd3" ]; then DVD_DEVICE="/dev/dvd3" else echo "Can not find the dvd device." >&2 @@ -628,22 +612,6 @@ function ripdvd () { alias ripcd=abcde -###################################################################### -# Upload the sources from the current directory to work - -function ulsrc () { - if [[ ! "${MY_WORK_MACHINE}" ]]; then - echo "\$MY_WORK_MACHINE undefined" 1>&2 - return 1 - fi - - DIR=${PWD/$HOME\//} - - scp {Makefile,*.{cc,h,sh}} ${MY_WORK_MACHINE}:${DIR} - - echo "Uploaded to ${MY_WORK_MACHINE}:${DIR}/" -} - ###################################################################### # Create small images from images @@ -660,11 +628,11 @@ function mksmall () { DEST_DIR=$1 - [[ ${DEST_DIR} ]] || DEST_DIR=./small + [ ${DEST_DIR} ] || DEST_DIR=./small mkdir -p ${DEST_DIR} - if [[ ! -d ${DEST_DIR} ]]; then + if [ ! -d ${DEST_DIR} ]; then echo "Can not create ${DEST_DIR}" >&2 return fi @@ -674,35 +642,9 @@ function mksmall () { for i in $(find -maxdepth 1 -type f); do if [[ $(file $i | grep image) ]]; then - if [[ -e ${DEST_DIR}/$i ]]; then + if [ -e ${DEST_DIR}/$i ]; then 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 - if [[ $(file ${i/%.*/}.* | grep -E movie) ]] ; then CAPTION_PARAMS="-font FreeSans-Bold -pointsize 32 -fill green -annotate +10+32 Video" else @@ -736,78 +678,6 @@ function mvtoconfig () { fi } -###################################################################### -# Track uncommited files (I presume this is very ugly from a real git -# user perspective) - -function git-fm () { - CURRENT_DIR=$(pwd) - NB_SUBDIR=0 - - for i in $(find -name ".git"); do - NB_SUBDIR=$((NB_SUBDIR+1)) - cd ${CURRENT_DIR}/$(dirname $i) - NB_MODIFIED=$(git status | grep modified | wc -l) - if [[ ${NB_MODIFIED} -gt 0 ]]; then - echo "$(dirname $i) (${NB_MODIFIED})" - git status | grep modified \ - | sed -e "s/^#\t/ /" | sed -e "s/modified: *//" - fi - done - - cd ${CURRENT_DIR} - - echo "Visited ${NB_SUBDIR} directories." -} - -# Update all the directories provided as argument in their respective -# versionning systems (SVN and GIT for now) - -function vcup () { - if [[ "$1" ]]; then - while [[ "$1" ]]; do - pushd > /dev/null "$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 "No known versioning system here." - fi - popd > /dev/null - shift - done - cd ${CURRENT} - else - vcup . - fi -} - -###################################################################### -# Downloads torrents located in ${BT_DIR}/torrents/ and puts the -# result in the ${BT_DIR} - -function bt () { - if [[ ${BT_DIR} ]]; then - if [[ -d "${BT_DIR}/torrents" ]]; then - if [[ "$1" ]]; then - mv "$1" ${BT_DIR}/torrents - fi - if [[ "$(ps auxwww | grep btlaunchmanycurses | grep -v grep)" ]]; then - echo "A client is already running." - else - cd ${BT_DIR} && screen btlaunchmanycurses torrents --max_upload_rate 32 - fi - else - echo "Directory ${BT_DIR}/torrents does not exist." - fi - else - echo "You have to set \$BT_DIR." - fi -} - ###################################################################### # The complex prompt policy @@ -892,26 +762,6 @@ function histfile_cue () { PS1="\[${VT_YELLOW_BG}\]\${HISTORY_CUE}\[${VT_RESET}\]${PS1}" -###################################################################### - -# parse_git_branch () { - # git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' -# } - -# parse_git_tag () { - # git describe --tags 2> /dev/null -# } - -# parse_git_branch_or_tag() { - # local OUT="$(parse_git_branch)" - # if [ "$OUT" == " ((no branch))" ]; then - # OUT="($(parse_git_tag))"; - # fi - # echo $OUT -# } - -# PS1="${PS1}\$(parse_git_branch_or_tag)" - ###################################################################### # The dus command is available on my web site # @@ -972,7 +822,7 @@ function lsn () { sort -u ${TMP} > ${LSN_MEMORY} \rm ${TMP} - elif [[ -n "$1" ]]; then + elif [ "$1" ]; then echo "lsn [--mem|-m] [+ ...]" >&2 return 1 @@ -983,7 +833,7 @@ function lsn () { TMP=$(mktemp /tmp/lsn.XXXXXX) \ls -pa | sort > ${TMP} if diff > /dev/null ${TMP} ${LSN_MEMORY}; then - echo "${VT_GREEN_FG}${VT_BOLD}No change${VT_RESET}" + echo "${VT_GREEN_FG}${VT_BOLD}No change (since $(date +"%b %d, %Y" -r ${LSN_MEMORY}))${VT_RESET}" else \comm -1 -3 ${LSN_MEMORY} ${TMP} \comm -2 -3 ${LSN_MEMORY} ${TMP} | while read line; do