From: Marcus Comstedt Date: Fri, 12 May 2017 09:05:08 +0000 (+0200) Subject: Make update-device-filter generate valid usb-device tags X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7156d3ec4d9e959d91b7627758dc9004d3a328b6;p=sigrok-androidutils.git Make update-device-filter generate valid usb-device tags Fixes #932 in the correct fashion --- diff --git a/Makefile.am b/Makefile.am index 94209c5..3678602 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,7 @@ update-device-filter: @echo "" @echo "" @echo "" - @echo -e -n `wget 'http://sigrok.org/gitweb/?p=libsigrok.git;a=blob_plain;f=contrib/z60_libsigrok.rules' -q -O - | grep idVendor | sed 's/ATTRS{idVendor}=="\(.*\)", ATTRS{idProduct}=="\(.*\)", MODE.*/\\\n/p' | sort | uniq` + @wget 'http://sigrok.org/gitweb/?p=libsigrok.git;a=blob_plain;f=contrib/z60_libsigrok.rules' -q -O - | perl -ne 'm/ATTRS\{idVendor\}=="([^"]*)", ATTRS\{idProduct\}=="([^"]*)"/ && print(" \n")' | sort | uniq @echo "" clean-local: diff --git a/device_filter.xml b/device_filter.xml index aeccd6f..ba5675d 100644 --- a/device_filter.xml +++ b/device_filter.xml @@ -1,71 +1,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +