X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=cbd3ac2903a6912580e06000a4f1bffd4905fcbd;hb=ff81e15c9417d9e4fa5efe39fb325b9fe8fdb2c0;hp=cbd8a10587f287556806199c8a17813aaf6f60d5;hpb=0f827af6891d1bb2f43cb4caef6f28fcfb12884c;p=scripts.git diff --git a/bashrc b/bashrc index cbd8a10..cbd3ac2 100644 --- a/bashrc +++ b/bashrc @@ -85,10 +85,11 @@ stty -ixon alias rm='rm -i' alias mv='mv -i' -alias chmod='chmod -v' +# alias chmod='chmod -v' +alias chmod='chmod -c' alias cp='cp -i' alias rd=rmdir -alias md=mkdir +alias md='mkdir -v' alias ps='ps uxaf' alias df='df -hT --sync' alias grep='grep -E --mmap' @@ -105,11 +106,13 @@ if [ -e "${HOME}/.dircolors" ]; then eval $(dircolors "${HOME}/.dircolors") alias ls='ls --color' # alias ll='ls --color -lth' + alias lt='ls --color -gohtr --time-style="+%Y %b %d %H:%M"' alias ll='ls --color -goh --time-style="+%Y %b %d %H:%M"' alias l='ls --color -I "*~" -I "*.o"' alias less='less -R' else # alias ll='ls -lth' + alias lt='ls -gohtr --time-style="+%Y %b %d %H:%M"' alias ll='ls -goh --time-style="+%Y %b %d %H:%M"' alias l='ls -I "*~" -I "*.o"' fi @@ -133,6 +136,19 @@ function fn () { find $* -name "*${name}*"; } +# Create a dir and cd there + +function mcd () { + mkdir -vp $1 + cd $1 +} + +alias trash=trash.sh + +function mmsget () { + mplayer $1 -dumpstream -dumpfile $(basename $1) +} + ###################################################################### # http://www.reddit.com/r/linux/comments/akt3j/a_functional_programming_style_map_function_for/ @@ -358,8 +374,7 @@ function dvd () { function ripdvd () { mkdir -p ${HOME}/dvds cd ${HOME}/dvds - dvdbackup -v -M - eject + dvdbackup -v -M && eject } ###################################################################### @@ -407,39 +422,50 @@ function mksmall () { NB=0 for i in $(find -maxdepth 1 -type f); do - 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" - ;; + if [[ $(file $i | grep image) ]]; then + if [[ -e ${DEST_DIR}/$i ]]; then + echo "The file ${DEST_DIR}/$i already exists." + else - *) - rotation_cmd="" - echo "Unknown orientation \"${orientation}\" !" - ;; - esac + 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 + CAPTION_PARAMS="" + fi + + convert ${rotation_cmd} $i ${PARAMS} ${CAPTION_PARAMS} ${DEST_DIR}/$i + fi - convert ${rotation_cmd} $i ${PARAMS} ${DEST_DIR}/$i + \ls -lt ${DEST_DIR}/$i fi - \ls -lt ${DEST_DIR}/$i + NB=$((NB+1)) + echo "$((NB*100/NB_TOTAL))% (${NB}/${NB_TOTAL})" done } @@ -671,7 +697,8 @@ alias dus='dus -f' # # git clone http://fleuret.org/git/finddup/ -alias finddup='finddup -p0d' +# alias finddup='finddup -p0d' +alias finddup='finddup -p' ###################################################################### # This script grep messages in my mail archives @@ -686,51 +713,38 @@ alias gma='gma.sh' # git clone http://fleuret.org/git/selector/ function selector-history () { - ARGS="-c 7 4 0 3 -q -b -i -d -v -w -l 15000" - FILES="" - - # I may have a "local bash history" specific to the current - # directory, and I also maintain a global "kept command" file. I - # take all this into account here. - - if [[ ${LOCAL_HISTORY_FILE} ]] && [[ -f ${LOCAL_HISTORY_FILE} ]]; then - FILES="${FILES} ${LOCAL_HISTORY_FILE}" - fi - - if [[ ${KEPT_COMMANDS} ]] && [[ -f ${KEPT_COMMANDS} ]]; then - selector ${ARGS} ${FILES} <(sed < ${KEPT_COMMANDS} -e 's/^.*: /0 /') <(history) - else - selector ${ARGS} ${FILES} <(history) - fi - + selector --bash -c 7,4,0,3 -q -l 15000 <(history) } -# M-r puts the selected history line in place of the current one - -bind '"\C-[r":"\C-a\C-kselector-history\C-m"' - -# M-t appends the selected history line and the end of the current one - -bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"' - -# Finds path in the history and make a list of the existing ones +# Find pathes in the history and make a list of the existing ones function selector-cd () { - LIST_TEMP=$(mktemp /tmp/cdlist.XXXXXX) + LIST_TEMP=$(mktemp /tmp/selector-cd-list.XXXXXX) + PATH_TEMP=$(mktemp /tmp/selector-cd-path.XXXXXX) for d in $(history | \ grep ^" *[0-9]* *cd" | \ awk '{ print $3 }' | \ grep -v "\.\." | \ uniq); do if [[ -d $d ]]; then - echo "$d!cd $d" + echo "$d" fi done >> ${LIST_TEMP} - selector -v -x '!' -d -i ${LIST_TEMP} + selector -d -i -o ${PATH_TEMP} ${LIST_TEMP} + cd $(cat ${PATH_TEMP}) \rm ${LIST_TEMP} + \rm ${PATH_TEMP} } -alias c=selector-cd +# M-r puts the selected history line in place of the current one + +bind '"\C-[r":"\C-a\C-kselector-history\C-m"' + +# M-t appends the selected history line and the end of the current one + +bind '"\C-[t":"\C-a\C-kselector-history\C-m\C-a\C-y\C-e"' + +# M-c provides a dynamic list of directories to cd into bind '"\C-[c":"\C-a\C-kselector-cd\C-m"' @@ -747,7 +761,7 @@ function prompt_command () { history -a # and the local histories system defined above keep_local_history -# and the no-history +# and the history cue histfile_cue }