Bug#634760: pct-scanner-scripts: fails when device name contains whitespace

[Daniel T Chen]

Package: pct-scanner-scripts
Version: 0.0.4-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:

  * Apply patch from Dwayne Litzenberger fixing improper quoting
    in the shell script. Thanks, Dwayne! (LP: #799190)


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-5-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u pct-scanner-scripts-0.0.4/pct-scanner-script pct-scanner-scripts-0.0.4/pct-scanner-script
--- pct-scanner-scripts-0.0.4/pct-scanner-script
+++ pct-scanner-scripts-0.0.4/pct-scanner-script
@@ -331,7 +331,7 @@
         exit 1
     fi
 
-    if [ $(echo "$SOURCE" | tr [:upper:] [:lower:]) == "flatbed" ]; then
+    if [ "$(echo "$SOURCE" | tr '[:upper:]' '[:lower:]')" == "flatbed" ]; then
         EXTRA="--end-count $startcount"
     fi
 
@@ -362,7 +362,7 @@
     echo $"resolution: $RESOLUTION"
     echo $"scanning of document has started, please standby ..."
     scan_busy_set
-    scanadf $VERBOSE --device-name $DEVICE --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source $SOURCE --resolution $RESOLUTION --mode Lineart --compression None -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
+    scanadf $VERBOSE --device-name "$DEVICE" --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source "$SOURCE" --resolution "$RESOLUTION" --mode Lineart --compression None -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
     scan_busy_unset
 }
 
@@ -380,7 +380,7 @@
     echo $"resolution: $RESOLUTION"
     echo $"scanning of document has started, please standby ..."
     scan_busy_set
-    scanadf $VERBOSE --device-name $DEVICE --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source $SOURCE --resolution $RESOLUTION --mode Color -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
+    scanadf $VERBOSE --device-name "$DEVICE" --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source "$SOURCE" --resolution "$RESOLUTION" --mode Color -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
     scan_busy_unset
 }
 
@@ -398,7 +398,7 @@
     echo $"resolution: $RESOLUTION"
     echo $"scanning of document has started, please standby ..."
     scan_busy_set
-    scanadf $VERBOSE --device-name $DEVICE --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source $SOURCE --resolution $RESOLUTION --mode Gray -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
+    scanadf $VERBOSE --device-name "$DEVICE" --scan-script "$COMMAND" --output-file "$OUTDIR"/scanscript/input/image-%04d.pbm --source "$SOURCE" --resolution "$RESOLUTION" --mode Gray -x 210.000mm -y 297.000mm --start-count "$startcount" $EXTRA $EXEC_VERBOSE
     scan_busy_unset
 }