Release new version 2.13.0

[grml-scripts.git] / usr_bin / iimage

diff --git a/usr_bin/iimage b/usr_bin/iimage
index 14ef84f..b2f81f7 100755 (executable)
--- a/usr_bin/iimage
+++ b/usr_bin/iimage
@@ -49,7 +49,7 @@
 #
 ######################################################################
 
-SVN_ID="$Id: iimage 36 2006-01-14 20:19:46Z ronsc $"
+SVN_ID="$Id: iimage 38 2009-12-15 20:30:46Z ronsc $"
 
 # old templates might still use CVS_VERSION
 CVS_VERSION="$SVN_ID"
@@ -112,7 +112,7 @@ function AVI_handler_prepare() {
          mplayer -quiet -frames 1 -ao none -vo jpeg -jpeg outdir=$DATADIR $1 >/dev/null 2>/dev/null
 
          if  [ -f "$DATADIR/00000001.jpg" ] ; then
-            convert "$DATADIR/00000001.jpg" -geometry $THUMBNAIL_GEOMETRY "$DST"
+            convert "$DATADIR/00000001.jpg" -resize $THUMBNAIL_GEOMETRY "$DST"
          fi
 
          rm -f $DATADIR 00000001.jpg 00000002.jpg
@@ -436,7 +436,7 @@ function rotate_image() {
                 | grep Orientation | cut -d":" -f 2  | cut -d"," -f 1 `
    elif [ $JHEAD ]; then
      ORIENTATION=`jhead -v "$FILE" 2>/dev/null \
-                | grep "Orientation =" | cut -d '=' -f 2 | cut -c 2 `
+                | grep "Orientation =" | head -1 | cut -d '=' -f 2 | cut -c 2 `
    fi
    ORIENTATION=`echo $ORIENTATION`
 
@@ -533,7 +533,7 @@ function build_thumbnail() {
 
          echo -n " T"
          convert  -quality $THUMBNAIL_QUALITY \
-                  -geometry "$GEOMETRY+0+0>" "$LASTIMAGE" \
+                  -resize "$GEOMETRY+0+0>" "$LASTIMAGE" \
                   "$DST"
 #                  +profile "$LASTIMAGE" \
 
@@ -1004,7 +1004,7 @@ function update_description_names() {
    find_all_images
    for i in $ALL_IMAGES ; do
 
-      if ! egrep "$i=" ./description >/dev/null ; then
+      if ! grep -E "$i=" ./description >/dev/null ; then
          echo "$i=`description $i`" >> ./description
       fi
 
@@ -2015,7 +2015,7 @@ if [ "$DISABLED" != "" ] ; then
    exit
 fi
 
-# check for programms ################################################
+# check for programs ################################################
 
 init_iimage