X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=fff96ac3cbaf2f3d9a28b64a1c476e1a8a4cf489;hb=d9930e7823c007964a023880587f23db98754eb8;hp=1a947db7768d411499b0d38417e84a59bd030f6d;hpb=0112da1a38def39a00d6c3d9fbc07a4efb4fb812;p=scripts.git diff --git a/bashrc b/bashrc index 1a947db..fff96ac 100644 --- a/bashrc +++ b/bashrc @@ -23,11 +23,11 @@ PRIVATE_BASHRC="${HOME}/private/bashrc.perso" # If the MANPATH is not set, set it -[ "${MANPATH}" ] || MANPATH=$(manpath) +[[ "${MANPATH}" ]] || MANPATH=$(manpath) # If the private bashrc exists, execute it -[ -f "${PRIVATE_BASHRC}" ] && source "${PRIVATE_BASHRC}" +[[ -f "${PRIVATE_BASHRC}" ]] && source "${PRIVATE_BASHRC}" # !!! THIS HAS TO BE HERE EVEN IN THE NON-INTERACTIVE PART OR YOU WILL # LOSE YOU PREVIOUS HISTORY !!! @@ -48,11 +48,13 @@ 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 -setterm -blength 0 +# setterm -blength 0 + +# || setterm --blength 0 # Seriously? ###################################################################### ## The interactive part @@ -100,15 +102,15 @@ ulimit -c unlimited alias ..='cd ..' alias -- -='cd -' -alias rm='rm -i' -alias mv='mv -i' -# alias chmod='chmod -v' +alias rm='rm -v -i' +alias mv='mv -v -i' alias chmod='chmod -c' -alias cp='cp -i -v' +alias cp='cp -v -i' 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 +124,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,14 +133,9 @@ 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 +if [[ -e "${HOME}/.dircolors" ]]; then eval $(dircolors "${HOME}/.dircolors") alias ls='ls -p --group-directories-first --color' alias lt='ls -p --color -gohtr --time-style="+%Y %b %d %H:%M"' @@ -163,24 +160,19 @@ 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) + # RECENT_LOG=$(ls -t $(find -maxdepth 1 -name "*.log" -type f) | head -1) + + RECENT_LOG=$(ls -t *.log | head -1) if [[ ${RECENT_LOG} ]]; then FILEBASE="${RECENT_LOG/.log/}" @@ -192,10 +184,16 @@ function rl () { pdflatex "${FILEBASE}" pdflatex "${FILEBASE}" - if [[ "$1" == "--view" ]]; then - xpdf "${FILEBASE}.pdf" - elif [[ "$1" == "--print" ]]; then - lpr "${FILEBASE}.pdf" + 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 @@ -215,6 +213,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,6 +242,14 @@ function bak () { done } +# A password generator + +function genpw () { + tr -dc A-Za-z0-9 < /dev/urandom | head -c16 + # tr -dc [:graph:] < /dev/urandom | head -c16 + echo +} + function ua () { [[ "$1" ]] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) @@ -237,7 +257,6 @@ function ua () { while [[ "$1" ]]; do case "$1" in - *.tgz|*.tar.gz|*.tbz|*.tar.bz2) tar xvf "$1" ;; @@ -315,53 +334,13 @@ function trash () { 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/ - -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 @@ -384,25 +363,13 @@ 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 function dt () { echo "Local: $(date)" if [[ ${TZ} ]]; then - unset TZ + local TZ=$(cat /etc/timezone) echo "Home: $(date)" fi } @@ -416,20 +383,40 @@ 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 () { - if [[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]; then - echo "There is already interface(s) up." >&2 + local upped_wifi + + [[ "${WIFI_INTERFACE}" ]] || WIFI_INTERFACE=wlan0 + + if [[ "$1" == "--scan" ]]; then + if ifconfig -s | grep -v -q ${WIFI_INTERFACE}; then + sudo ifconfig ${WIFI_INTERFACE} up + upped_wifi=1 + fi + + sudo iwlist ${WIFI_INTERFACE} scan | \grep -E 'ESS|Quali|Encry' | sed -e 's/^[ \t]*//' + + if [[ ${upped_wifi} ]]; then + sudo ifconfig ${WIFI_INTERFACE} down + unset upped_wifi + fi + + return 0 + fi + + 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 @@ -445,7 +432,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 @@ -474,9 +461,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} @@ -494,7 +479,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 @@ -513,12 +498,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! @@ -542,10 +521,21 @@ 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} + 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 @@ -555,21 +545,21 @@ function keep () { # I sometime burn CDs and DVDs function burn () { - DEVICE="/dev/cdrw" + [[ "${DEV_BURNER}" ]] || DEV_BURNER="/dev/sr0" if [[ ! "$1" ]]; then echo "burn " >&2 elif [[ -f "$1" ]]; then - if [[ $(file "$1" | grep "ISO 9660") ]]; then - wodim -eject -v dev=${DEVICE} "$1" + if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then + wodim -eject -v dev=${DEV_BURNER} "$1" else - echo "Unknown type of $1" >&2 + echo "Do not know what to do with $1" >&2 fi 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" && \ - wodim -eject -v dev=${DEVICE} ${TMP} + wodim -eject -v dev=${DEV_BURNER} ${TMP} rm -f ${TMP} else echo "Can not find $1" >&2 @@ -610,7 +600,7 @@ 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 () { @@ -628,33 +618,23 @@ function ripdvd () { mkdir -p ${HOME}/dvds cd ${HOME}/dvds - time dvdbackup -i ${DVD_DEVICE} -v -M $* && eject + time dvdbackup -i ${DVD_DEVICE} -v -M "$@" && eject } 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 function mksmall () { - PARAMS="-geometry 800x600" + if [[ "$1" == "--params" ]]; then + shift + PARAMS="$1" + shift + fi + + [[ "${PARAMS}" ]] || PARAMS="-geometry 1280x1024" # Auto-orient does not seem to work at all, hence the ugly hack # with exif below @@ -682,32 +662,6 @@ function mksmall () { 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 @@ -741,82 +695,12 @@ 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." -} - -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 "No known versioning system." - fi - 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 export PS1 -if [ "${CONSOLE}" == "yes" ]; then +if [[ "${CONSOLE}" == "yes" ]]; then PS1="" else @@ -824,38 +708,32 @@ else # 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 + 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 - [ "${DISPLAY}" != ":0.0" ] && IDENT="${IDENT}@\h" + [[ "${DISPLAY}" != ":0.0" ]] && IDENT="${IDENT}@\h" # If there is the login or the hostname, add a ":" to the prompt - [ "${IDENT}" ] && IDENT="${IDENT}:" - - # If we are root, show that in red + [[ "${IDENT}" ]] && IDENT="${IDENT}:" if [[ ${USER} == "root" ]]; then + # If we are root, show that in red PS1="\[${VT_RED_BG}${VT_WHITE_FG}\]${IDENT}\w\[${VT_RESET}\] " else - PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] " + if [[ $(\grep QEMU /proc/cpuinfo) ]]; then + # If we are in a qemu virtual machine, in yellow + PS1="\[${VT_YELLOW_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] " + else + # Otherwise in white + PS1="\[${VT_WHITE_BG}${VT_BLACK_FG}\]${IDENT}\w\[${VT_RESET}\] " + fi fi - # 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}\] " - # else - # PS1="\[${VT_WHITE_BG}\]${IDENT}\w\[${VT_RESET}\] " - # fi - fi ###################################################################### @@ -883,7 +761,7 @@ function keep_local_history () { PS1="\[${VT_WHITE_BG}\]\${LOCAL_HISTORY_HINT}\[${VT_RESET}\]${PS1}" ###################################################################### -# Switch off the history +# Show the history path if it is unusual function histfile_cue () { if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]]; then @@ -914,6 +792,8 @@ alias finddup='finddup -p' # # git clone http://fleuret.org/git/selector/ +export SELECTOR_CD_HISTORY_SIZE=10000 + source bash-selector.sh --hist --cd ###################################################################### @@ -938,29 +818,73 @@ function selector-printer () { # the current directory function lsn () { - LSN_MEMORY=".lsn-state" + [[ "${LSN_STATE_FILE}" ]] || LSN_STATE_FILE=".lsn-state" + if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]]; then - \ls -pa | sort > ${LSN_MEMORY} + + \ls -pa | sort > "${LSN_STATE_FILE}" echo "State updated." >&2 - elif [[ -n "$1" ]]; then - echo "lsn [--mem|-m]" >&2 - return 1 + + elif [[ $1 == "+" ]]; then + + shift + + TMP=$(mktemp /tmp/lsn.XXXXXX) + \ls -d "$@" > ${TMP} + cat "${LSN_STATE_FILE}" >> ${TMP} + sort ${TMP} | uniq -u > "${LSN_STATE_FILE}" + \rm ${TMP} + + elif [[ "$1" ]]; then + cat >&2 < ...] + +Where + + --help|-h + prints this help + + --mem|-m + stores the current state of the directory + + + [ ...] + switches the presence/absence of the indicated files in the + stored state + +EOF + if [[ ! "$1" == "-h" ]] && [[ ! "$1" == "--help" ]]; then + echo >&2 "Unknown option \`\`$1''." + return 1 + fi + 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 + + if [[ -f "${LSN_STATE_FILE}" ]]; then + TMP=$(mktemp /tmp/lsn.XXXXXX) + \ls -pa | sort > ${TMP} + if diff > /dev/null ${TMP} "${LSN_STATE_FILE}"; then + echo "${VT_GREEN_FG}${VT_BOLD}No change (since $(date +"%b %d, %Y" -r "${LSN_STATE_FILE}"))${VT_RESET}" + else + \comm -1 -3 "${LSN_STATE_FILE}" ${TMP} + \comm -2 -3 "${LSN_STATE_FILE}" ${TMP} | while read line; do + echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)" + done + fi + \rm ${TMP} else - echo "No lsn state here." >&2 + echo "${VT_RED_FG}${VT_BOLD}No lsn state here.${VT_RESET}" >&2 return 1 fi + fi } ###################################################################### function prompt_command () { + # if [[ $(umask) != 0022 ]]; then + # echo "Umask changed to $(umask)" + # fi # save the history after every command to avoid loosing some when # multiple shells are open history -a @@ -978,8 +902,6 @@ PROMPT_COMMAND="prompt_command" # Displaying the timezone if it is set -if [[ ${TZ} ]]; then - echo "${VT_BOLD}${VT_GREEN_FG}Time zone is ${TZ}.${VT_RESET}" -fi +[[ ${TZ} ]] && echo "${VT_BLUE_FG}Time zone is ${TZ}.${VT_RESET}" ######################################################################