Diff for /scripts/pgallery/src/libpgallery.sh between versions 1.3 and 1.6

version 1.3, 2012/08/31 15:52:10 version 1.6, 2013/04/03 08:33:29
Line 1 Line 1
 #!/bin/sh  #!/bin/sh
 #  #
# THE BEER-WARE LICENSE 2012# THE BEER-WARE LICENSE 2012,13
 #
 # <as@paefchen.net> wrote this file. As long as you retain this notice you  # <as@paefchen.net> wrote this file. As long as you retain this notice you
 # can do whatever you want with this stuff. If we meet some day, and you think  # can do whatever you want with this stuff. If we meet some day, and you think
 # this stuff is worth it, you can buy me a beer in return Aron Schlesinger  # this stuff is worth it, you can buy me a beer in return Aron Schlesinger
 #  #
# $Paefchen: scripts/pgallery/src/libpgallery.sh,v 1.2 2012/08/31 14:26:58 as Exp $# $Paefchen: scripts/pgallery/src/libpgallery.sh,v 1.5 2012/09/11 16:24:46 as Exp $
 #  #
   
 BIN_CONVERT="/usr/local/bin/convert"  BIN_CONVERT="/usr/local/bin/convert"
Line 14  BIN_IMGINFO="/usr/local/bin/imginfo" Line 15  BIN_IMGINFO="/usr/local/bin/imginfo"
 BIN_SENDMAIL="/usr/sbin/sendmail"  BIN_SENDMAIL="/usr/sbin/sendmail"
 BIN_EXIFTRAN="/usr/local/bin/exiftran"  BIN_EXIFTRAN="/usr/local/bin/exiftran"
 BIN_EXIF="/usr/local/bin/exif"  BIN_EXIF="/usr/local/bin/exif"
   BIN_JPEGINFO="/usr/local/bin/jpeginfo"
   BIN_ICONV="/usr/local/bin/iconv"
   
 ARGFILE=".htpgallery"  ARGFILE=".htpgallery"
VERSION="pgallery-1.3"VERSION="pgallery-1.4"
   
 #  #
 # get_my_path()  # get_my_path()
Line 141  body > div.t { Line 144  body > div.t {
         border-style: solid;          border-style: solid;
         box-shadow: 1px 1px 2px #000000;          box-shadow: 1px 1px 2px #000000;
         margin-bottom: -6px;          margin-bottom: -6px;
           display: $(test $ARG_NAVI -eq 1 && echo block || echo none);
 }  }
 body > div.t div.center {  body > div.t div.center {
         position: absolute;          position: absolute;
Line 489  get_exif_info() Line 493  get_exif_info()
                         exifinfo="$exifinfo$exif "                          exifinfo="$exifinfo$exif "
                 fi                  fi
         done          done
        echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/ se(c|k)./s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'        echo $exifinfo | sed -E -e 's/ mm /mm /' -e 's/( |([[:digit:]]))se(c|k)\./\2s/' -e 's/ ISO / ISO/' -e 's/ ISO(\/| )/ \1/'
 }  }
   
 #  #

Removed from v.1.3  
changed lines
  Added in v.1.6