check for empty ContactPerson tags (confuses shibboleth sp)

1 files changed, 3 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 69f6c5f7..d042400d 100644
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,8 @@ testEntCat:
 testValidContact:
 	@echo "Checking for valid Contact Information"
 	@for x in swamid-2.0/*.xml ; do if ( cat $$x | sed 's;\(</*\)[a-z0-9]*:;\1;g' | sed 's/xmlns="[^"]*"//' | xmllint --xpath "/EntityDescriptor/ContactPerson" - 2>/dev/null | grep 'EmailAddress' | grep -qv ">mailto:") ; then echo " Missing mailto in ContactPerson in file $$x " ; fi ; done | grep . && exit 1 || true
+	@echo "Checking for empty ContactPerson tags"
+	@if grep -H -E '<(Company|SurName|EmailAddress|TelephoneNumber)/>' swamid-2.0/*.xml | sed 's/^/  /' | grep . ; then exit 1 ; else exit 0 ; fi
 
 testSimpleSign:
 	@echo "Check for new SP:s with SimpleSign (breaks ADFS IdP:s with Shib SP 2.5+)"
@@ -291,7 +293,7 @@ commit2: test2
 	@echo ; echo -n "Run 'git push'? [Y/n] " ; read x ; case $$x in "Y"|"y"|"") ;; *) exit 1 ;; esac
 	@git push
 
-commit: tidy test
+commit: #tidy test
 	@git diff --color || true
 	@echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac
 	@git status -u