From c6d04acc4bfc72906e7d7d71850a709da4c5debb Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Sun, 24 May 2020 16:16:15 -0700 Subject: [PATCH] test.sh: account for variations in output of identify --verbose --- test.sh | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/test.sh b/test.sh index e41dbe5..2764ca9 100755 --- a/test.sh +++ b/test.sh @@ -882,8 +882,8 @@ identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Mime type: image/tiff identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Type: TrueColor$' -identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Endianess: LSB$' -identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Depth: 32/8-bit$' +identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Endiann\?ess: LSB$' +identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Depth: 32/\(8\|16\)-bit$' # imagemagick may produce a Depth: 32/8-bit or 32/16-bit image identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/float.tiff" | grep --quiet '^ Compression: Zip$' identify -verbose "$tempdir/float.tiff" | grep --quiet '^ quantum:format: floating-point$' @@ -912,7 +912,7 @@ identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Mime type: image/tiff identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Colorspace: CMYK$' identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Type: ColorSeparation$' -identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Depth: 8-bit$' identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/cmyk8.tiff" | grep --quiet '^ Compression: Zip$' @@ -959,7 +959,7 @@ identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Mime type: image/tif identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Colorspace: CMYK$' identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Type: ColorSeparation$' -identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Depth: 16-bit$' identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/cmyk16.tiff" | grep --quiet '^ Compression: Zip$' @@ -989,7 +989,7 @@ identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Mime type: image/tif identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Type: TrueColor$' -identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Depth: 8-bit$' identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/normal.tiff" | grep --quiet '^ Compression: Zip$' @@ -1031,7 +1031,7 @@ identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Mime type: image/tif identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Type: TrueColorAlpha$' -identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Depth: 8-bit$' identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/alpha8.tiff" | grep --quiet '^ Compression: Zip$' @@ -1060,7 +1060,7 @@ identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Mime type: image/ti identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Type: TrueColorAlpha$' -identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Depth: 16-bit$' identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/alpha16.tiff" | grep --quiet '^ Compression: Zip$' @@ -1089,7 +1089,7 @@ identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Mime type: image/tiff identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Colorspace: Gray$' identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Type: Bilevel$' -identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Depth: 1-bit$' identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/gray1.tiff" | grep --quiet '^ Compression: Zip$' @@ -1133,7 +1133,7 @@ for i in 2 4 8; do identify -verbose "$tempdir/gray$i.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/gray$i.tiff" | grep --quiet '^ Colorspace: Gray$' identify -verbose "$tempdir/gray$i.tiff" | grep --quiet '^ Type: Grayscale$' - identify -verbose "$tempdir/gray$i.tiff" | grep --quiet '^ Endianess: LSB$' + identify -verbose "$tempdir/gray$i.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/gray$i.tiff" | grep --quiet "^ Depth: $i-bit$" identify -verbose "$tempdir/gray$i.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/gray$i.tiff" | grep --quiet '^ Compression: Zip$' @@ -1177,7 +1177,7 @@ identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Mime type: image/tif identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Colorspace: Gray$' identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Type: Grayscale$' -identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/gray16.tiff" | grep --quiet "^ Depth: 16-bit$" identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/gray16.tiff" | grep --quiet '^ Compression: Zip$' @@ -1206,7 +1206,7 @@ identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Mime type: ima identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Type: TrueColor$' -identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Depth: 8-bit$' identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/multipage.tiff[0]" | grep --quiet '^ Compression: Zip$' @@ -1219,7 +1219,7 @@ identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Mime type: ima identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Type: TrueColor$' -identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Endianess: LSB$' +identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Endiann\?ess: LSB$' identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Depth: 8-bit$' identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Page geometry: 60x60+0+0$' identify -verbose "$tempdir/multipage.tiff[1]" | grep --quiet '^ Compression: Zip$' @@ -1274,7 +1274,7 @@ for i in 1 2 4 8; do identify -verbose "$tempdir/palette$i.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/palette$i.tiff" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/palette$i.tiff" | grep --quiet '^ Type: Palette$' - identify -verbose "$tempdir/palette$i.tiff" | grep --quiet '^ Endianess: LSB$' + identify -verbose "$tempdir/palette$i.tiff" | grep --quiet '^ Endiann\?ess: LSB$' if [ "$i" -eq 8 ]; then identify -verbose "$tempdir/palette$i.tiff" | grep --quiet "^ Depth: 8-bit$" else @@ -1333,7 +1333,7 @@ for i in 12 14 16; do identify -verbose "$tempdir/normal$i.tiff" | grep --quiet '^ Geometry: 60x60+0+0$' identify -verbose "$tempdir/normal$i.tiff" | grep --quiet '^ Colorspace: sRGB$' identify -verbose "$tempdir/normal$i.tiff" | grep --quiet '^ Type: TrueColor$' - identify -verbose "$tempdir/normal$i.tiff" | grep --quiet '^ Endianess: LSB$' + identify -verbose "$tempdir/normal$i.tiff" | grep --quiet '^ Endiann\?ess: LSB$' if [ $i -eq 16 ]; then identify -verbose "$tempdir/normal$i.tiff" | grep --quiet "^ Depth: $i-bit$" else @@ -1367,9 +1367,9 @@ tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Photometric Interpretation: min- tiffinfo "$tempdir/group4.tiff" | grep --quiet 'FillOrder: msb-to-lsb' tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Samples/Pixel: 1' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Type: Bilevel' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endianess: LSB' +identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endian*ess: LSB' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Depth: 1-bit' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'gray: 1-bit' +identify -verbose "$tempdir/group4.tiff" | grep --quiet '[gG]ray: 1-bit' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Compression: Group4' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:endian: lsb' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:photometric: min-is-white' @@ -1409,9 +1409,9 @@ tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Photometric Interpretation: min- tiffinfo "$tempdir/group4.tiff" | grep --quiet 'FillOrder: msb-to-lsb' tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Samples/Pixel: 1' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Type: Bilevel' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endianess: MSB' +identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endian*ess: MSB' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Depth: 1-bit' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'gray: 1-bit' +identify -verbose "$tempdir/group4.tiff" | grep --quiet '[gG]ray: 1-bit' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Compression: Group4' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:endian: msb' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:photometric: min-is-white' @@ -1451,9 +1451,9 @@ tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Photometric Interpretation: min- tiffinfo "$tempdir/group4.tiff" | grep --quiet 'FillOrder: lsb-to-msb' tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Samples/Pixel: 1' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Type: Bilevel' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endianess: MSB' +identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endian*ess: MSB' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Depth: 1-bit' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'gray: 1-bit' +identify -verbose "$tempdir/group4.tiff" | grep --quiet '[gG]ray: 1-bit' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Compression: Group4' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:endian: msb' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:photometric: min-is-white' @@ -1498,9 +1498,9 @@ tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Photometric Interpretation: min- #tiffinfo "$tempdir/group4.tiff" | grep --quiet 'FillOrder: msb-to-lsb' #tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Samples/Pixel: 1' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Type: Bilevel' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endianess: LSB' +identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endian*ess: LSB' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Depth: 1-bit' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'gray: 1-bit' +identify -verbose "$tempdir/group4.tiff" | grep --quiet '[gG]ray: 1-bit' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Compression: Group4' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:endian: lsb' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:photometric: min-is-black' @@ -1546,9 +1546,9 @@ tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Photometric Interpretation: min- tiffinfo "$tempdir/group4.tiff" | grep --quiet 'FillOrder: msb-to-lsb' && exit 1 tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Samples/Pixel: 1' && exit 1 identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Type: Bilevel' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endianess: LSB' +identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endian*ess: LSB' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Depth: 1-bit' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'gray: 1-bit' +identify -verbose "$tempdir/group4.tiff" | grep --quiet '[gG]ray: 1-bit' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Compression: Group4' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:endian: lsb' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:photometric: min-is-white' @@ -1591,9 +1591,9 @@ tiffinfo "$tempdir/group4.tiff" | grep --quiet 'FillOrder: msb-to-lsb' tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Samples/Pixel: 1' tiffinfo "$tempdir/group4.tiff" | grep --quiet 'Rows/Strip:' && exit 1 identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Type: Bilevel' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endianess: LSB' +identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Endian*ess: LSB' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Depth: 1-bit' -identify -verbose "$tempdir/group4.tiff" | grep --quiet 'gray: 1-bit' +identify -verbose "$tempdir/group4.tiff" | grep --quiet '[gG]ray: 1-bit' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'Compression: Group4' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:endian: lsb' identify -verbose "$tempdir/group4.tiff" | grep --quiet 'tiff:photometric: min-is-white'