diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | scripts/get-metadata.sh | 8 | ||||
| -rw-r--r-- | swamid-sp-2.0.mxml | 1 |
3 files changed, 8 insertions, 2 deletions
@@ -147,6 +147,7 @@ tidy: @for x in `find $(SRCDIRS) -name \*.xml`; do xsltproc xslt/clean-entitydescriptor.xsl $$x > $$x.c && mv $$x.c $$x; done commit: tidy test + @git diff @echo ; echo -n "Run 'git commit -a'? [Y/n/s] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s) ;; *) exit 1 ;; esac @git status -u @echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/ /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh index d47acfa5..78e68514 100755 --- a/scripts/get-metadata.sh +++ b/scripts/get-metadata.sh @@ -15,12 +15,16 @@ if [ -z "$metadataurl" ] ; then Usage: `basename $0` <metadataurl> Ex: `basename $0` https://shibsp.mysite.com/Shibboleth.sso/Metadata `basename $0` https://shibidp.mysite.com/idp/profile/Metadata/SAML - `basename $0` file://some-downloaded-metadata.xml + `basename $0` some-downloaded-metadata.xml EOF exit 1 fi -metadata=`curl -s -k -f $metadataurl` +if echo "$metadataurl" | grep -qE '^http://|^https://' ; then + metadata=`curl -s -k -f $metadataurl` +else + metadata=`cat $metadataurl` +fi [ -n "$metadata" ] || error "Failed to fetch metadata from $metadataurl" entityid=`echo "$metadata" | sed -n 's/.*entityID=['\''"]\([^"]*\)['\''"].*/\1/p'` diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml index a0235caa..7ed991fb 100644 --- a/swamid-sp-2.0.mxml +++ b/swamid-sp-2.0.mxml @@ -266,4 +266,5 @@ <xi:include href="swamid-1.0/hr.su.se-shibboleth.xml"/> <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml"/> <xi:include href="swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml"/> + <xi:include href="swamid-2.0/pingpong.ki.se-shibboleth.xml"/> </md:EntitiesDescriptor> |