changeset 999:f8a93c42287b cannam

Merge from branch "live"
author Chris Cannam
date Fri, 09 Nov 2012 09:44:24 +0000
parents a5af76c3fca0 (current diff) 3549525ba22a (diff)
children 48ddad528c51
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/extra/soundsoftware/extract-javadoc.sh	Fri Oct 26 17:19:19 2012 +0100
+++ b/extra/soundsoftware/extract-javadoc.sh	Fri Nov 09 09:44:24 2012 +0000
@@ -35,8 +35,8 @@
 # package declarations
 
 find "$projectdir" -type f -name \*.java \
-    -exec grep '^ *package [a-zA-Z][a-zA-Z0-9\._-]*; *$' \{\} /dev/null \; |
-    sed -e 's/\/[^\/]*: *package */:/' -e 's/; *$//' |
+    -exec egrep '^ *package +[a-zA-Z][a-zA-Z0-9\._-]*;.*$' \{\} /dev/null \; |
+    sed -e 's/\/[^\/]*: *package */:/' -e 's/;.*$//' |
     sort | uniq | (
 	current_prefix=
 	current_packages=