X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=bashrc;h=eb288b1d744fea57c5fd056379de02626ed46ae4;hb=88cc045a5eecced9d8f71c2a8e0aef67a8d94368;hp=6ca8dcd226f642ad3fa7d1edfb0d01bd9a20d55d;hpb=de6bde6c9f9529c1537904ce339b057783e421f7;p=scripts.git

diff --git a/bashrc b/bashrc
index 6ca8dcd..eb288b1 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,14 +136,15 @@ function fn () {
     find $* -name "*${name}*";
 }
 
-# Move things to a trash directory in /tmp/
+# Create a dir and cd there
 
-function trash () {
-    TRASH=$(date +/tmp/trash-%Y-%b-%d-%H_%M_%S)
-    mkdir ${TRASH} && mv $* ${TRASH}
-    \ls -ad ${TRASH}/*
+function mcd () {
+    mkdir -vp $1
+    cd $1
 }
 
+alias trash=trash.sh
+
 ######################################################################
 # http://www.reddit.com/r/linux/comments/akt3j/a_functional_programming_style_map_function_for/
 
@@ -366,8 +370,7 @@ function dvd () {
 function ripdvd () {
     mkdir -p ${HOME}/dvds
     cd ${HOME}/dvds
-    dvdbackup -v -M
-    eject
+    dvdbackup -v -M && eject
 }
 
 ######################################################################
@@ -415,45 +418,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"
-                    ;;
-
-                *)
-                    rotation_cmd=""
-                    echo "Unknown orientation \"${orientation}\" !"
-                    ;;
-            esac
-
-            if [[ -f ${i/JPG/MOV} ]]; then
-                CAPTION_PARAMS="-font vera-sans -pointsize 24 -fill white -annotate +10+32 Video"
+        if [[ $(file $i | grep image) ]]; then
+            if [[ -e ${DEST_DIR}/$i ]]; then
+                echo "The file ${DEST_DIR}/$i already exists."
             else
-                CAPTION_PARAMS=""
+
+                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} ${CAPTION_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
 }
@@ -685,7 +693,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
@@ -700,7 +709,7 @@ alias gma='gma.sh'
 # git clone http://fleuret.org/git/selector/
 
 function selector-history () {
-    selector -c 7 4 0 3 -q -b -i -d -v -w -l 15000 <(history)
+    selector -c 7,4,0,3 -q -b -i -d -v -w -l 15000 <(history)
 }
 
 # M-r puts the selected history line in place of the current one