X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=scripts.git;a=blobdiff_plain;f=bashrc;h=20cb77dd7ddf77bd78b38e1b8717a5c637bdb729;hp=0ce1e409070651c8a63f8facd515b051be52961c;hb=715b46d9325d15fc04870c057ce67bf88138b545;hpb=d26b38afff52ff3b13303962bda478884696e0f0 diff --git a/bashrc b/bashrc index 0ce1e40..20cb77d 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 @@ -90,6 +92,10 @@ export LESS_TERMCAP_ue=${VT_RESET} export LESS_TERMCAP_md=${VT_BLUE_FG}${VT_BOLD} export LESS_TERMCAP_me=${VT_RESET} +# I do not like to clutter my home with history files + +export LESSHISTFILE=/dev/null + # export LESS_TERMCAP_md=$'\e[1;34;40m' # This prevents ^S from freezing the shell @@ -100,11 +106,10 @@ 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' @@ -116,14 +121,24 @@ alias pd=pushd alias val='valgrind --leak-check=full --show-reachable=yes --db-attach=yes ' alias s='screen -d -R -U && clear' +alias p='feh --force-aliasing -d --full-screen --auto-zoom' function nh () { export HISTFILE=/dev/null unalias cd } +function select-tz () { + # Select a value for TZ + TMP=$(mktemp /tmp/select-tz.XXXXXX) + selector -o "${TMP}" <(grep -v ^# /usr/share/zoneinfo/zone.tab | awk '{print $3}' | sort -u) + cat "${TMP}" + \rm -f "${TMP}" +} + 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" @@ -132,14 +147,10 @@ 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"' @@ -164,39 +175,39 @@ 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 + if [[ ${RECENT_LOG} ]] + then FILEBASE="${RECENT_LOG/.log/}" - if [[ -f "${FILEBASE}.tex" ]]; then + if [[ -f "${FILEBASE}.tex" ]] + then - pdflatex "${FILEBASE}" + pdflatex --shell-escape "${FILEBASE}" bibtex "${FILEBASE}" - pdflatex "${FILEBASE}" - pdflatex "${FILEBASE}" + pdflatex --shell-escape "${FILEBASE}" + pdflatex --shell-escape "${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 @@ -222,6 +233,22 @@ 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 () { @@ -231,17 +258,73 @@ function fn () { } function bak () { - while [[ "$1" ]]; do + while [[ "$1" ]] + do cp "$1" "$1".bak shift done } +function scan () { + n=1 + + while [[ -f "${HOME}/scan-${n}.jpg" ]] + do + n=$((n+1)) + done + + while [[ "$1" ]] + do + if [[ "$1" == "color" ]] + then + OPTS+=" --mode Color" + elif [[ "$1" == "gray" ]] + then + OPTS+=" --mode Gray" + elif [[ "$1" == "a4crop" ]] + then + OPTS+=" -l 5 -t 0 -x 200 -y 300" + elif [[ "$1" == "help" ]] || [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]] + then + echo "$0 [color|gray] [a4crop]" && return 0 + else + echo "Unknown argument \`$1'" + fi + shift + done + + echo "**" + echo "** Scanning to ${HOME}/scan-${n}.jpg" + echo "**" + + SCANNER=$(scanimage -L | grep "Canon LiDE 60" | sed -e "s/^.*\`\(.*\)'.*$/\1/") + + scanimage -d ${SCANNER} \ + --format=pnm \ + --mode=color \ + --depth=8 \ + -v \ + --resolution=300 \ + ${OPTS} | \ + convert -rotate 180 - "${HOME}/scan-${n}.jpg" + + echo "** 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) - while [[ "$1" ]]; do + while [[ "$1" ]] + do case "$1" in *.tgz|*.tar.gz|*.tbz|*.tar.bz2) @@ -276,13 +359,21 @@ 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" + + if [[ "$1" ]] + then + echo "Waiting $1 s and saving to ${name}." + sleep "$1" + else + echo "Saving to ${name}." + fi + echo "Please click on the window to capture." xwd | convert - ${name} \ls -l ${name} @@ -292,8 +383,10 @@ 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 @@ -302,10 +395,12 @@ 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} @@ -313,46 +408,22 @@ function cdt () { } alias t='cd /tmp' +alias a='cd /tmp/at' function trash () { - TRASH=$(date +/tmp/trash-%Y-%b-%d-%Hh) + TRASH=$(date +/tmp/trash-${USER}-%Y-%b-%d-%Hh) LINK=/tmp/trash mkdir -p ${TRASH} [[ -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 @@ -379,11 +450,9 @@ function pho () { ## A version of date that shows the time at home if TZ is set function dt () { - echo "Local: $(date)" - if [[ ${TZ} ]]; then - unset TZ - echo "Home: $(date)" - fi + echo "Local - $(date)" + unset TZ + echo "Home - $(date)" } ###################################################################### @@ -395,42 +464,52 @@ 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 - if [[ $1 == "--scan" ]]; then - if [[ ! $(\ifconfig -s | grep ${WIFI_INTERFACE}) ]]; then + [[ "${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 + 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 @@ -441,7 +520,8 @@ 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 @@ -454,14 +534,16 @@ 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/=.*$//") @@ -470,19 +552,19 @@ 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} - # if [[ $(\ps -C dhclient | tail -n +2) ]]; then + # if [[ $(\ps -C dhclient | tail -n +2) ]] + # then # echo "There is still a dhcp client running." >&2 # return 1 # fi - # if [[ $(\ps -C wpa_supplicant | tail -n +2) ]]; then + # if [[ $(\ps -C wpa_supplicant | tail -n +2) ]] + # then # echo "There is still a wpa_supplicant running." >&2 # return 1 # fi @@ -490,7 +572,8 @@ 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 @@ -509,12 +592,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! @@ -537,15 +614,18 @@ function shuffle () { KEPT_COMMANDS=${HOME}/.kept_bash_commands function keep () { - if [[ ${KEPT_COMMANDS} ]]; then + if [[ ${KEPT_COMMANDS} ]] + then TOKEEP=$(mktemp /tmp/keep.XXXXXX) - if [[ "$*" ]]; then - echo "$*" > ${TOKEEP} + if [[ "$@" ]] + then + echo "$@" > ${TOKEEP} else selector -b -i -d -l ${HISTSIZE} -o "${TOKEEP}" <(history) fi - if [[ -s "${TOKEEP}" ]]; then + if [[ -s "${TOKEEP}" ]] + then echo $(date)": "$(cat ${TOKEEP}) >> ${KEPT_COMMANDS} cat "${TOKEEP}" else @@ -558,36 +638,29 @@ function keep () { fi } -# 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} - # else - # echo "You have to set \$KEPT_COMMANDS" - # fi -# } - ###################################################################### # I sometime burn CDs and DVDs function burn () { - DEVICE="/dev/cdrw1" - if [[ ! "$1" ]]; then + [[ "${DEV_BURNER}" ]] || DEV_BURNER="/dev/sr0" + if [[ ! "$1" ]] + then echo "burn " >&2 - elif [[ -f "$1" ]]; then - if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then - wodim -eject -v dev=${DEVICE} "$1" + elif [[ -f "$1" ]] + then + if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]] + then + wodim -eject -v dev=${DEV_BURNER} "$1" else echo "Do not know what to do with $1" >&2 fi - elif [[ -d "$1" ]]; then + 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 @@ -607,7 +680,8 @@ function dvd () { echo " / * Volume" echo - if [[ "$1" ]]; then + if [[ "$1" ]] + then dvd_device="$1" shift else @@ -616,7 +690,8 @@ function dvd () { title="1" - if [[ "$1" ]]; then + if [[ "$1" ]] + then title=$1 shift fi @@ -632,9 +707,11 @@ function dvd () { } 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 @@ -646,33 +723,24 @@ 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 @@ -687,7 +755,8 @@ function mksmall () { mkdir -p ${DEST_DIR} - if [[ ! -d ${DEST_DIR} ]]; then + if [[ ! -d ${DEST_DIR} ]] + then echo "Can not create ${DEST_DIR}" >&2 return fi @@ -695,38 +764,16 @@ function mksmall () { NB_TOTAL=$(find -maxdepth 1 -type f | wc -l) NB=0 - for i in $(find -maxdepth 1 -type f); do - if [[ $(file $i | grep image) ]]; then - if [[ -e ${DEST_DIR}/$i ]]; then + for i in $(find -maxdepth 1 -type f) + do + if [[ $(file $i | grep image) ]] + 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 + if [[ $(file ${i/%.*/}.* | grep -E movie) ]] + then CAPTION_PARAMS="-font FreeSans-Bold -pointsize 32 -fill green -annotate +10+32 Video" else CAPTION_PARAMS="" @@ -750,7 +797,8 @@ function mksmall () { function mvtoconfig () { CONFIGDIR=${HOME}/sources/config - if [[ -d ${CONFIGDIR} ]]; then + if [[ -d ${CONFIGDIR} ]] + then NEWNAME=${CONFIGDIR}/$(basename "$1" | sed -e "s/^\.//") mv "$1" $NEWNAME ln -s $NEWNAME $1 @@ -759,125 +807,55 @@ 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 export PS1 -if [ "${CONSOLE}" == "yes" ]; then +if [[ "${CONSOLE}" == "yes" ]] +then + PS1="" + else # If the login is a standard one (as specified in # 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}:" + [[ "${IDENT}" ]] && IDENT="${IDENT}:" - # If we are root, show that in red - - if [[ ${USER} == "root" ]]; then + 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 +PS1="${PSCUE}${PS1}" + ###################################################################### # This implements a local history. If we are in a directory containing # a writable local history file, we add the last line of the global @@ -886,7 +864,8 @@ fi LOCAL_HISTORY_FILE=".local_bash_history" function keep_local_history () { - if [[ -w "${LOCAL_HISTORY_FILE}" ]]; then + if [[ -w "${LOCAL_HISTORY_FILE}" ]] + then history 1 | sed -e 's/^ *[0-9]* *//' >> ${LOCAL_HISTORY_FILE} TMP=$(mktemp /tmp/lh.XXXXXX) \chmod 600 ${TMP} @@ -903,10 +882,11 @@ 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 + if [[ ! "${HISTFILE}" == "${HOME}/.bash_history" ]] + then HISTORY_CUE="[${HISTFILE}]" else HISTORY_CUE="" @@ -915,26 +895,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 # @@ -954,6 +914,8 @@ alias finddup='finddup -p' # # git clone http://fleuret.org/git/selector/ +export SELECTOR_CD_HISTORY_SIZE=10000 + source bash-selector.sh --hist --cd ###################################################################### @@ -978,44 +940,68 @@ 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 + if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]] + then - \ls -pa | sort > ${LSN_MEMORY} + \ls -pa | sort > "${LSN_STATE_FILE}" echo "State updated." >&2 - elif [[ $1 == "+" ]]; then + elif [[ $1 == "+" ]] + then shift TMP=$(mktemp /tmp/lsn.XXXXXX) - \ls -d $* > ${TMP} - cat ${LSN_MEMORY} >> ${TMP} - sort -u ${TMP} > ${LSN_MEMORY} + \ls -d "$@" > ${TMP} + cat "${LSN_STATE_FILE}" >> ${TMP} + sort ${TMP} | uniq -u > "${LSN_STATE_FILE}" \rm ${TMP} - elif [[ -n "$1" ]]; then + elif [[ "$1" ]] + then + cat >&2 < ...] - echo "lsn [--mem|-m] [+ ...]" >&2 - return 1 +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 + if [[ -f "${LSN_STATE_FILE}" ]] + then 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 (since $(date +"%b %d, %Y" -r ${LSN_MEMORY}))${VT_RESET}" + 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_MEMORY} ${TMP} - \comm -2 -3 ${LSN_MEMORY} ${TMP} | while read line; do + \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 @@ -1025,6 +1011,13 @@ function lsn () { ###################################################################### function prompt_command () { + [[ "${CORE_CHECK_PWD}" == ${PWD} ]] || find . -maxdepth 1 -name "core__*" | awk '{print "'${VT_RED_FG}'"$0"'${VT_RESET}'"}' + CORE_CHECK_PWD=${PWD} + + # 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 @@ -1042,8 +1035,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}" ######################################################################