X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=bashrc;h=0ce1e409070651c8a63f8facd515b051be52961c;hb=56758159a2d6ce0599166d86f53b46b6ccac54af;hp=ad114070e9497c890610d4008bf4cf89691beebe;hpb=0f23707db99e494a1c69981078ca2489a004c9bb;p=scripts.git diff --git a/bashrc b/bashrc index ad11407..0ce1e40 100644 --- a/bashrc +++ b/bashrc @@ -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 @@ -192,10 +193,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 @@ -237,7 +244,6 @@ function ua () { while [[ "$1" ]]; do case "$1" in - *.tgz|*.tar.gz|*.tbz|*.tar.bz2) tar xvf "$1" ;; @@ -321,25 +327,10 @@ function 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/ @@ -384,18 +375,6 @@ 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 @@ -419,6 +398,23 @@ function dt () { [[ ${NETUP_HISTORY} ]] || NETUP_HISTORY="${HOME}/.netup_history" function netup () { + WIFI_INTERFACE=wlan0 + + if [[ $1 == "--scan" ]]; then + if [[ ! $(\ifconfig -s | grep ${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 + fi + + return 0 + fi + if [[ $(\ifconfig -s | grep -v ^"(Iface|lo) ") ]]; then echo "There is already interface(s) up." >&2 return 1 @@ -517,7 +513,7 @@ function lr () { # 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; } +function c () { cd "$@" && lr; } ###################################################################### # You can change the xterm background color on the fly! @@ -542,27 +538,49 @@ 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 } +# 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/cdrw" + DEVICE="/dev/cdrw1" if [[ ! "$1" ]]; then echo "burn " >&2 elif [[ -f "$1" ]]; then - if [[ $(file "$1" | grep "ISO 9660") ]]; then + if [[ $(file "$1" | \grep -E 'ISO 9660|UDF filesystem data') ]]; then wodim -eject -v dev=${DEVICE} "$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/ @@ -610,7 +628,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 () { @@ -765,12 +783,13 @@ function git-fm () { 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 - CURRENT=${PWD} while [[ "$1" ]]; do - cd ${CURRENT} - cd $1 + pushd > /dev/null "$1" if [[ -d ".git" ]]; then echo "${PWD} is under GIT" git pull @@ -778,8 +797,9 @@ function vcup () { echo "${PWD} is under SVN" svn update else - echo "No known versioning system." + echo "No known versioning system here." fi + popd > /dev/null shift done cd ${CURRENT} @@ -895,6 +915,26 @@ 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 # @@ -938,18 +978,47 @@ function selector-printer () { # the current directory function lsn () { - LSN_MEMORY=".lsn-mem" - if [[ $1 == "--mem" ]]; then - \ls -p > ${LSN_MEMORY} + LSN_MEMORY=".lsn-state" + + if [[ $1 == "--mem" ]] || [[ "$1" == "-m" ]]; then + + \ls -pa | sort > ${LSN_MEMORY} + echo "State updated." >&2 + + elif [[ $1 == "+" ]]; then + + shift + + TMP=$(mktemp /tmp/lsn.XXXXXX) + \ls -d $* > ${TMP} + cat ${LSN_MEMORY} >> ${TMP} + sort -u ${TMP} > ${LSN_MEMORY} + \rm ${TMP} + + elif [[ -n "$1" ]]; then + + echo "lsn [--mem|-m] [+ ...]" >&2 + return 1 + else + if [[ -f ${LSN_MEMORY} ]]; then - comm -1 -3 ${LSN_MEMORY} <(\ls -p) - comm -2 -3 ${LSN_MEMORY} <(\ls -p) | while read line; do - echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)" - done + 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}" + else + \comm -1 -3 ${LSN_MEMORY} ${TMP} + \comm -2 -3 ${LSN_MEMORY} ${TMP} | while read line; do + echo "${VT_RED_FG}${VT_BOLD}${line}${VT_RESET} (missing)" + done + fi + \rm ${TMP} else - echo "No lsn memory here." >&2 + echo "No lsn state here." >&2 + return 1 fi + fi }