Merge commit 'f587'HEADmaster

1 files changed, 10 insertions, 9 deletions

diff --git a/dot/local/bin/scan b/dot/local/bin/scan
index 2ba071b..2a7ac71 100644
--- a/dot/local/bin/scan
+++ b/dot/local/bin/scan
@@ -1,16 +1,17 @@
 #!/bin/sh
 NOW=$( TZ=UTC date -Ins | tr T . | tr -d : | sed -E 's/(..),(...).*/\1.\2/' )
 
-if [ $# = 0 ]
+if [ "$ACTUAL_BATCH" -a $# = 0 ]
 then
-        ACTUAL_BATCH=
-fi
-
-if $ACTUAL_BATCH
-then
-        format=scan_${NOW}_%.3d.png
+        FORMAT=scan_${NOW}_%.3d.png
 else
-        format=scan_${NOW}.png
+        FORMAT=scan_${NOW}.png
 fi
 
-scanimage --progress --format=png --batch="$format"
+RESOLUTION=600
+
+scanimage --progress \
+        --mode=Color \
+        --resolution="$RESOLUTION" \
+        --format=png \
+        --batch="$FORMAT"