[pkg-opensc-commit] [opensc] 15/295: Relax XML parsing regexes for bash_completion

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository opensc.

commit da4446a822b949b90356ff05569824e5059f07c9
Author: Michael Ansel <github at anselcomputers.com>
Date:   Thu Jun 9 14:34:31 2016 -0700

    Relax XML parsing regexes for bash_completion
    
    Unnecessarily strict regex was failing for some unknown reason on OS X. Easier to just relax the regex than understand what's wrong (and then relax the regex).
    Fixes #782
---
 doc/tools/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
index e4279ed..cc2b944 100644
--- a/doc/tools/Makefile.am
+++ b/doc/tools/Makefile.am
@@ -30,13 +30,13 @@ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdi
 	@echo $< $@
 	@cat $(srcdir)/completion-template \
 		| sed "s,ALLOPTS,\
-			$(shell sed -n 's,\s\s\s*<option>\([^<]*\)</option>.*,\1,pg' $< \
+			$(shell sed -n 's,.*<option>\([^<]*\)</option>.*,\1,pg' $< \
 				| sort -u | grep -- '^\-' | tr '\n' ' ')," \
 		| sed "s,OPTSWITHARGS,\
-			$(shell sed -n 's,\s\s\s*<option>\([^<]*\)</option>.*<replaceable>.*,\1,pg' $< \
+			$(shell sed -n 's,.*<option>\([^<]*\)</option>.*<replaceable>.*,\1,pg' $< \
 				| sort -u | grep -- '^\-' | tr '\n' '|' | sed 's,|$$,,')," \
 		| sed "s,FILEOPTS,\
-			$(shell sed -n 's,\s\s\s*<option>\([^<]*\)</option>.*<replaceable>.*filename.*,\1,pg' $< \
+			$(shell sed -n 's,.*<option>\([^<]*\)</option>.*<replaceable>.*filename.*,\1,pg' $< \
 				| sort -u | grep -- '^\-' | tr '\n' '|')," \
 		| sed "s,FUNCTION_NAME,$(shell echo $@ | sed s,-,_,g)," \
 		| sed "s,PROGRAM_NAME,$@," \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/opensc.git