Many changes!!!

diff --git a/archivepics.sh b/archivepics.sh
index afaf5d4..202d73c 100755 (executable)
--- a/archivepics.sh
+++ b/archivepics.sh
@@ -39,7 +39,7 @@ fi
 
 for i in "$@"; do
 
-    if [[ ! -f ${i/JPG/MOV} ]]; then
+    if [[ ! -f ${i/JPG/MOV} ]] && [[ ! -f ${i/JPG/3gp} ]]; then
 
         if [[ $(stat --printf=%s $i) -lt ${archive_size_min} ]]; then
             echo "Image $i is too small."
@@ -54,7 +54,13 @@ done
 
 for i in "$@"; do
 
-    ref=${i/MOV/JPG}
+    base=${i/%.???/}
+
+    if [[ -f ${base}.JPG ]]; then ref=${base}.JPG; fi
+    if [[ -f ${base}.jpg ]]; then ref=${base}.jpg; fi
+    if [[ -f ${base}.jpeg ]]; then ref=${base}.jpeg; fi
+
+    echo "ref=${ref}"
 
     if [[ -f ${ref} ]]; then
 

diff --git a/bashrc b/bashrc
index 2539fdb..eb288b1 100644 (file)
--- a/bashrc
+++ b/bashrc
@@ -89,7 +89,7 @@ alias mv='mv -i'
 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'
@@ -106,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
@@ -137,7 +139,7 @@ function fn () {
 # Create a dir and cd there
 
 function mcd () {
-    mkdir -p $1
+    mkdir -vp $1
     cd $1
 }
 
@@ -368,8 +370,7 @@ function dvd () {
 function ripdvd () {
     mkdir -p ${HOME}/dvds
     cd ${HOME}/dvds
-    dvdbackup -v -M
-    eject
+    dvdbackup -v -M && eject
 }
 
 ######################################################################
@@ -417,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
 }

diff --git a/dns323-op.sh b/dns323-op.sh
index 2aa5c14..614eb21 100755 (executable)
--- a/dns323-op.sh
+++ b/dns323-op.sh
@@ -34,7 +34,8 @@ function authentify_on_dns323 () {
         echo "Authentifying on ${DNS323_HOSTNAME}."
         curl -s > /dev/null \
             -L http://${DNS323_HOSTNAME}/goform/formLogin \
-            -d "f_LOGIN_NAME=admin&f_LOGIN_PASSWD=${DNS323_ADMIN_PASSWORD}&f_login_type=0" || (echo "Failed." >&2 && exit 1)
+            -d "f_LOGIN_NAME=admin&f_LOGIN_PASSWD=${DNS323_ADMIN_PASSWORD}&f_login_type=0" \
+            || (echo "Failed." >&2 && exit 1)
         already_authentified=1
     fi
 }

diff --git a/gma.sh b/gma.sh
index 640c7f3..8725acc 100755 (executable)
--- a/gma.sh
+++ b/gma.sh
@@ -20,7 +20,7 @@
 set -e
 
 function usage () {
-    echo "gma.sh [--body] [--from|--to|--fromto] <pattern> [<year>]"
+    echo "gma.sh [--body] [--subject|--from|--to|--fromto|--subject] <pattern> [<year>]"
 }
 
 RESULT_MBOX="/tmp/gma"
@@ -61,6 +61,10 @@ while [[ $1 ]]; do
             RE_PREFIX="^(From|To):.*"
             ;;
 
+        "--subject")
+            RE_PREFIX="^Subject:.*"
+            ;;
+
         *)
             if [[ ${PATTERN} ]]; then
                 if [[ ${FILE_PATTERN} ]]; then

diff --git a/hotspot.sh b/hotspot.sh
index f979c11..e3cac28 100755 (executable)
--- a/hotspot.sh
+++ b/hotspot.sh
@@ -70,6 +70,7 @@ function sigint-handler () {
 }
 
 function scan () {
+    echo
     echo "  Scanning ..."
     iwconfig ${INTERFACE} ap off essid ""
     iwlist ${INTERFACE} scan | \
@@ -173,7 +174,7 @@ function process-key () {
         e) # Selects essid + dhcp
             SELECTED=$(get-selected-essid-ap)
             ESSID=$(echo ${SELECTED} | cut -f 1 -d,)
-            echo "Running DHCP on ${INTERFACE} for ESSID ${ESSID}."
+            echo "Running DHCP on ${INTERFACE} for ESSID \"${ESSID}\"."
             iwconfig ${INTERFACE} ap auto essid "${ESSID}"
             kill-dhcp
             echo
@@ -190,7 +191,7 @@ function process-key () {
             SELECTED=$(get-selected-essid-ap)
             ESSID=$(echo ${SELECTED} | cut -f 1 -d,)
             AP=$(echo ${SELECTED} | cut -f 2 -d,)
-            echo "Running DHCP on ${INTERFACE} for ESSID ${ESSID} and AP ${AP}."
+            echo "Running DHCP on ${INTERFACE} for ESSID \"${ESSID}\" and AP ${AP}."
             iwconfig ${INTERFACE} ap ${AP} essid "${ESSID}"
             kill-dhcp
             echo

diff --git a/print.sh b/print.sh
index 9ac874d..fc88668 100755 (executable)
--- a/print.sh
+++ b/print.sh
@@ -93,7 +93,7 @@ for arg in $*; do
 
                 *" text"*)
                     # a2ps -B -R --columns=1 -f 8 -o ${tmp} ${arg}
-                    a2ps --user-option=lp -o ${tmp} ${arg}
+                    a2ps --media=A4 --user-option=lp -o ${tmp} ${arg}
                     ;;
 
                 *"gzip compressed"*)