[PC-BSD Commits] r12132 - pcbsd/current/mfsroot-overlay/root/cardDetect

[svn at pcbsd.org]

Author: kris
Date: 2011-08-15 11:46:27 -0700 (Mon, 15 Aug 2011)
New Revision: 12132

Modified:
   pcbsd/current/mfsroot-overlay/root/cardDetect/setuptouch.sh
Log:

Use newer setuptouch.sh script on install media



Modified: pcbsd/current/mfsroot-overlay/root/cardDetect/setuptouch.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/root/cardDetect/setuptouch.sh	2011-08-15 17:45:47 UTC (rev 12131)
+++ pcbsd/current/mfsroot-overlay/root/cardDetect/setuptouch.sh	2011-08-15 18:46:27 UTC (rev 12132)
@@ -7,14 +7,12 @@
 ##############################################################################
 # Check for any touch-screen devices
 
-for uh in `ls /dev/uhid*`
+for uh in `ls /dev/uhid* 2>/dev/null`
 do
   touch=0
-  tcount=`usbhidctl -f $uh -r | grep 'Collection page=Digitizer' | \
-  grep -e 'page=Pointer' \
-  -e 'usage=Mouse' \
-  -e 'usage=Finger' \
-  -e 'usage=Stylus' \
+  tcount=`usbhidctl -f $uh -r | \
+  egrep 'Collection( type=Application)? page=(Generic_Desktop|Digitizer) | \
+  grep -e 'usage=Mouse' \
   -e 'usage=Digitizer' \
   -e 'usage=Pen' \
   -e 'usage=Light_Pen' \
@@ -28,7 +26,7 @@
   -e 'usage=Armature' \
   -e 'usage=Multiple_Point_Digitizer' \
   -e 'usage=Free_Space_Wand' \
-  | sort | uniq | wc -l | awk '{print $1}'`
+  | wc -l | awk '{print $1}'`
 
   # Make sure we have a valid number
   expr $tcount + 1 2>/dev/null