Option to set format. Defualt is now png

diff --git a/scan2pages.sh b/scan2pages.sh
index c9a10c8..249f2ad 100755 (executable)
--- a/scan2pages.sh
+++ b/scan2pages.sh
@@ -9,7 +9,8 @@ OPTIONS:
        -v: Be verbose.
        -d depth: Use given depth. Default is 1 for black and white, 8 for colour.
                Unpaper can only handle up to 8.
-       -D dpi: Use given DPI. Colour scans on library scanners are usually 300, bw 400. 
+       -D dpi: Use given DPI. Colour scans on library scanners are usually 300, bw 400.
+       -F extension: use the output format signified by the extension. Default is png
        -s: skip masking/trimming. Overrides -m.
        -f: Forceably redo everything.
        -p: Forceably redo pdf conversion. Implies options below, equivalent to -f.
@@ -40,7 +41,8 @@ depth=
 dpi=
 skipmask=
 verbose=
-while getopts 'vd:sfpmuc' OPTION
+extension="png"
+while getopts 'vd:sfpmucF:' OPTION
 do
        case $OPTION in
        v)      verbose=1
@@ -63,9 +65,8 @@ do
                ;;
        t)      forceclean=1
                ;;
-#      b)      bflag=1
-#              bval="$OPTARG"
-#              ;;
+       F)      extension="$OPTARG"
+               ;;
        ?)      usage
                exit 2
                ;;
@@ -162,11 +163,11 @@ for pg in `$my_seq 1 $pages`; do
        unpaper $unpaperflags --layout double --overwrite --no-blackfilter -ni 10 -op 2 $preppnm $unppnm || exit 1
 
        # final convert and clean
-       convert $convertflags $dir/upg-${pgn}-?.pnm $dir/upg-${pgn}-%01d.tiff || exit 1
+       convert $convertflags $dir/upg-${pgn}-?.pnm $dir/upg-${pgn}-%01d.${extension} || exit 1
        
        
 done
 
 mkdir $dir/pages
-mv $dir/upg-*.tiff $dir/pages
+mv $dir/upg-*.${extension} $dir/pages