v/sane-scan-pdf
1
0
Fork 0
mirror of https://github.com/rocketraman/sane-scan-pdf.git synced 2025-06-02 15:30:17 -07:00
Code Issues Projects Releases Wiki Activity

Explicit --mode overrides --mode-hw-default

Browse Source
This commit is contained in:
Raman Gupta 2022-02-23 21:53:55 -05:00
parent ad5934a5a6
commit 5116541cf0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scan
View File

@ -44,6 +44,7 @@ trap cleanup EXIT
DEFAULTS="${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/defaults" DEFAULTS="${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/defaults"
SCANPRE="${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/scan_pre" SCANPRE="${XDG_DATA_HOME:-$HOME/.local/share}/sane-scan-pdf/scan_pre"
[ -e "$DEFAULTS" ] && . "$DEFAULTS" [ -e "$DEFAULTS" ] && . "$DEFAULTS"
# Parse command-line options # Parse command-line options
@ -117,7 +118,7 @@ if [[ $HELP == 1 ]]; then
echo " -m, --mode" echo " -m, --mode"
echo " Mode e.g. Lineart (default), Halftone, Gray, Color, etc. Use --mode-hw-default to not set any mode" echo " Mode e.g. Lineart (default), Halftone, Gray, Color, etc. Use --mode-hw-default to not set any mode"
echo " --mode-hw-default" echo " --mode-hw-default"
echo " Do not set the mode explicitly, use the hardware default" echo " Do not set the mode explicitly, use the hardware default — ignored if --mode is set"
echo " -r, --resolution" echo " -r, --resolution"
echo " Resolution e.g 300 (default)" echo " Resolution e.g 300 (default)"
echo " -a, --append" echo " -a, --append"
@ -191,9 +192,8 @@ if [[ $USEARRAY == 1 && $USEOUTPUT == 1 ]]; then
exit 1 exit 1
fi fi
if [[ $MODE_CHANGED == 1 && $MODE_HW_DEFAULT == 1 ]]; then if [[ $MODE_CHANGED == 1 ]]; then
echo >&2 "Use one of -m/--mode or --mode-hardware-default. Aborting." MODE_HW_DEFAULT=0
exit 1
fi fi
if [[ $MODE_CHANGED == 0 && $MODE_HW_DEFAULT == 0 ]]; then if [[ $MODE_CHANGED == 0 && $MODE_HW_DEFAULT == 0 ]]; then