Merge pull request #5 from janrueth/fix-space

Support spaces in device name

Author: janrueth

CMakeLists.txt

@@ -3,7 +3,7 @@ project (es2button)
 set(CMAKE_INSTALL_PREFIX "/usr")
 set(CMAKE_PROJECT_VERSION_MAJOR 0)
 set(CMAKE_PROJECT_VERSION_MINOR 2)
-set(CMAKE_PROJECT_VERSION_PATCH 0)
+set(CMAKE_PROJECT_VERSION_PATCH 1)
 set(CMAKE_PROJECT_HOMEPAGE_URL "https://github.com/janrueth/es2button")
 
 # download epson source

example/example-epsonscan2.sh

@@ -15,10 +15,10 @@ fi
 echo "Starting scan"
 if [[ ${ES2_CARD_SCANNING} = "No" ]]; then
     echo "Scanning A4 paper"
-    epsonscan2 -s ${ES2_DEV} $(dirname $0)/a4_preset.SF2
+    epsonscan2 -s "${ES2_DEV}" $(dirname $0)/a4_preset.SF2
 else
     echo "Scanning plastic card"
-    epsonscan2 -s ${ES2_DEV} $(dirname $0)/card_preset.SF2
+    epsonscan2 -s "${ES2_DEV}" $(dirname $0)/card_preset.SF2
 fi
 
 echo "Finished scan"

example/example-scanimage.sh

@@ -29,10 +29,10 @@ then
     # protocol=esci2 only supported by sane
     # transport=usb only supported
     # model_from_pid
-    scanimage -d epsonscan2:${ES2_DEV}:esci2:usb:${model}:${pid_as_dec} --duplex=yes --resolution=400 --scan-area A4 --deskew=yes -b "img%d.jpeg"
+    scanimage -d "epsonscan2:${ES2_DEV}:esci2:usb:${model}:${pid_as_dec}" --duplex=yes --resolution=400 --scan-area A4 --deskew=yes -b "img%d.jpeg"
 else
     echo "Scanning plastic card"
-    scanimage -d epsonscan2:${ES2_DEV}:esci2:usb:${model}:${pid_as_dec} --duplex=yes --resolution=400 --scan-area PlasticCard --deskew=yes -b "card%d.jpeg"
+    scanimage -d "epsonscan2:${ES2_DEV}:esci2:usb:${model}:${pid_as_dec}" --duplex=yes --resolution=400 --scan-area PlasticCard --deskew=yes -b "card%d.jpeg"
 fi
 
 echo "Finished scan"

resources/udev-es2button.rules

@@ -10,7 +10,7 @@ ACTION!="add|bind", GOTO="es2button_add_rules_end"
 LABEL="es2button_add_rules_begin"
 
 # these are set by the epsonscan2 rules, we just match on everything it matches
-ENV{epsonscan2_driver}=="esci*", ENV{libsane_matched}=="yes", PROGRAM="/bin/systemd-escape %s{product}:%s{busnum}:%s{devnum}", RUN+="/usr/bin/systemctl start es2button@%c.service"
+ENV{epsonscan2_driver}=="esci*", ENV{libsane_matched}=="yes", PROGRAM="/bin/systemd-escape '%s{product}:%s{busnum}:%s{devnum}'", RUN+="/usr/bin/systemctl start es2button@%c.service"
 
 LABEL="es2button_add_rules_end"