Merge pull request #36 from DavidFromNL/master

Four suggestions
This commit is contained in:
Raman Gupta 2021-10-22 01:45:41 -04:00 committed by GitHub
commit c621a12cb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

9
scan
View File

@ -31,6 +31,7 @@ DESKEW=0
DRIVER_OPTION= DRIVER_OPTION=
VERBOSE=0 VERBOSE=0
SKIP_EMPTY_PAGES=0 SKIP_EMPTY_PAGES=0
SOURCE=""
TMP_DIR=$(mktemp -d -p "" scan.XXXXXXXXXX) TMP_DIR=$(mktemp -d -p "" scan.XXXXXXXXXX)
cleanup() cleanup()
@ -39,6 +40,8 @@ cleanup()
} }
trap cleanup EXIT trap cleanup EXIT
[ -e "${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/defaults" ] && . "${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/defaults"
# Parse command-line options # Parse command-line options
while [[ $# > 0 ]]; do while [[ $# > 0 ]]; do
case "$1" in case "$1" in
@ -122,7 +125,7 @@ if [[ $HELP == 1 ]]; then
echo " -pw, --page-width" echo " -pw, --page-width"
echo " Custom Page Width in mm" echo " Custom Page Width in mm"
echo " -x, --device" echo " -x, --device"
echo " Override scanner device name, defaulting to \"fujitsu\"" echo " Override scanner device name, defaulting to \"$DEVICE\""
echo " -xo, --driver-options" echo " -xo, --driver-options"
echo " Send additional options to the scanner driver e.g." echo " Send additional options to the scanner driver e.g."
echo " -xo \"--whatever bar --frobnitz baz\"" echo " -xo \"--whatever bar --frobnitz baz\""
@ -191,7 +194,6 @@ if [[ $USEARRAY == 1 ]]; then
OUTPUT=("${OUTPUTARR[@]}") OUTPUT=("${OUTPUTARR[@]}")
fi fi
SOURCE=""
if [[ $DUPLEX == 1 ]]; then if [[ $DUPLEX == 1 ]]; then
SOURCE="--source \"ADF Duplex\"" SOURCE="--source \"ADF Duplex\""
fi fi
@ -270,7 +272,8 @@ if [[ $MODE_HW_DEFAULT == 1 ]]; then
else else
MODE="--mode '$MODE'" MODE="--mode '$MODE'"
fi fi
eval scanadf -d \'"$DEVICE"\' $MAXPAGE $PGHEIGHT $PGWIDTH -S $SCRIPT --script-wait --resolution $RESOLUTION $MODE $DESKEW $CROP $DRIVER_OPTION $SOURCE -o $TMP_DIR/scan-%04d [ -e "${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/scan_pre" ] && . "${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/scan_pre"
eval scanadf -d \'"$DEVICE"\' $MAXPAGE $PGHEIGHT $PGWIDTH -S $SCRIPT --script-wait $MODE $DESKEW $CROP $DRIVER_OPTION $SOURCE --resolution $RESOLUTION -o $TMP_DIR/scan-%04d
# Simulate empty page scanner outputs for debugging # Simulate empty page scanner outputs for debugging
#convert xc:none -page Letter $TMP_DIR/scan-0001.pdf #convert xc:none -page Letter $TMP_DIR/scan-0001.pdf