X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=cb98ffa989b7737ef22149af1ec80ec77853a34a;hb=2ef9154eec1d4732fc9bbad47b66f48854fa3ce6;hp=0ce1e409070651c8a63f8facd515b051be52961c;hpb=d26b38afff52ff3b13303962bda478884696e0f0;p=scripts.git diff --git a/bashrc b/bashrc index 0ce1e40..cb98ffa 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 @@ -100,11 +100,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' @@ -123,7 +122,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" @@ -132,14 +131,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"' @@ -164,17 +158,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 @@ -222,6 +209,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 () { @@ -237,6 +238,13 @@ function bak () { done } +# Password generator + +function pwgen () { + tr -dc A-Za-z0-9 < /dev/urandom | head -c16 + echo +} + function ua () { [[ "$1" ]] || ( echo "Universal unarchive: ua [ ...]" >&2 && return 1) @@ -321,38 +329,13 @@ function 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 @@ -395,37 +378,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 () { - 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 @@ -441,7 +427,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 @@ -470,9 +456,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} @@ -490,7 +474,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 @@ -509,12 +493,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! @@ -558,17 +536,6 @@ 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 @@ -651,28 +618,12 @@ 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 function mksmall () { - PARAMS="-geometry 800x600" + [[ "${PARAMS}" ]] || PARAMS="-geometry 800x600" # Auto-orient does not seem to work at all, hence the ugly hack # with exif below @@ -700,32 +651,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 @@ -759,84 +684,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." -} - -# 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 @@ -844,38 +697,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 ###################################################################### @@ -915,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 # @@ -995,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