Resolved SWAMID-3397 and SWAMID-3520

8 files changed, 8 insertions, 8 deletions

diff --git a/scripts/get-metadata.sh b/scripts/get-metadata.sh
index fae50ebb..39e401c2 100755
--- a/scripts/get-metadata.sh
+++ b/scripts/get-metadata.sh
@@ -52,7 +52,7 @@ entityid=`echo "$metadata" | sed -n 's/.*entityID=['\''"]\([^"]*\)['\''"].*/\1/p
 [ -n "$entityid" ] || error "Failed to find entityID in metadata"
 [ `echo "$entityid" | wc -l` = 1 ] || error "Multiple entityid:s found: `echo $entityid`"
 
-entityidfn=`echo "$entityid" | sed 's;https*://;;' | tr 'A-Z' 'a-z' | sed 's;/$;;' | sed 's/[^a-z0-9_.-]/-/g' | sed 's/\.xml$//;s/$/.xml/'`
+entityidfn=`echo "$entityid" | sed 's;https*://;;' | tr 'A-Z' 'a-z' | sed 's/[^a-z0-9_.-]/-/g' | sed 's/\.xml$//;s/$/.xml/'`
 [ -n "$entityidfn" ] || error "Failed to generate filename from entityid $entityid"
 
 [ -r "$entityidfn" ] && new=false || new=true
diff --git a/sp-with-coco-errors b/sp-with-coco-errors
index a871c441..8d154bfe 100644
--- a/sp-with-coco-errors
+++ b/sp-with-coco-errors
@@ -15,5 +15,5 @@ swamid-2.0/us.cloudmore.com-shibboleth.xml
 swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
 swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-2.xml
 swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
-swamid-2.0/moodle.media.nordu.net.xml
+swamid-2.0/moodle.media.nordu.net-.xml
 swamid-2.0/portalservices.miun.se-shibboleth.xml
diff --git a/swamid-2.0/moodle.media.nordu.net.xml b/swamid-2.0/moodle.media.nordu.net-.xml
index 1b3dacf9..1b3dacf9 100644
--- a/swamid-2.0/moodle.media.nordu.net.xml
+++ b/swamid-2.0/moodle.media.nordu.net-.xml
diff --git a/swamid-2.0/sdauth.sciencedirect.com.xml b/swamid-2.0/sdauth.sciencedirect.com-.xml
index 5334999f..5334999f 100644
--- a/swamid-2.0/sdauth.sciencedirect.com.xml
+++ b/swamid-2.0/sdauth.sciencedirect.com-.xml
diff --git a/swamid-2.0/sp.sprakochfolkminnen.se.xml b/swamid-2.0/sp.sprakochfolkminnen.se-.xml
index 12ff60bd..12ff60bd 100644
--- a/swamid-2.0/sp.sprakochfolkminnen.se.xml
+++ b/swamid-2.0/sp.sprakochfolkminnen.se-.xml
diff --git a/swamid-2.0/test.itslearning.com.xml b/swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml
index 3dd056e1..3dd056e1 100644
--- a/swamid-2.0/test.itslearning.com.xml
+++ b/swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 525ace00..e5d95acc 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -39,10 +39,10 @@
   <xi:include href="swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/sp.sprakochfolkminnen.se.xml"/>
+  <xi:include href="swamid-2.0/sp.sprakochfolkminnen.se-.xml"/>
   <xi:include href="swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/indico.nordu.net-mellon.xml"/>
-  <xi:include href="swamid-2.0/moodle.media.nordu.net.xml"/>
+  <xi:include href="swamid-2.0/moodle.media.nordu.net-.xml"/>
   <xi:include href="swamid-2.0/errorurl-sp-demo.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/edusign.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/signservice.edusign.sunet.se-sigservice.xml"/>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ef5762d8..6ebeb88f 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -152,7 +152,7 @@
   <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"/>
-  <xi:include href="swamid-2.0/sdauth.sciencedirect.com.xml"/>
+  <xi:include href="swamid-2.0/sdauth.sciencedirect.com-.xml"/>
   <xi:include href="swamid-2.0/test.mp.uu.se-shibboleth-sso.xml"/>
   <xi:include href="swamid-2.0/wiki.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-Shibboleth.sso.xml"/>
@@ -397,7 +397,7 @@
   <xi:include href="swamid-2.0/pingpong.hj.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/redcap.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/redcap.tst.ki.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test.itslearning.com.xml"/>
+  <xi:include href="swamid-2.0/urn-mace-saml2v2.no-services-com.itslearning.test.xml"/>
   <xi:include href="swamid-2.0/test-rkh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml"/>
   <xi:include href="swamid-2.0/rkh.pingpong.net-Shibboleth.sso-Metadata.xml"/>
@@ -558,7 +558,7 @@
   <xi:include href="swamid-2.0/utmanande.math.su.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/vfusyd.su.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml"/>
-  <xi:include href="swamid-2.0/sp.sprakochfolkminnen.se.xml"/>
+  <xi:include href="swamid-2.0/sp.sprakochfolkminnen.se-.xml"/>
   <xi:include href="swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml"/>
   <xi:include href="swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml"/>
   <xi:include href="swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml"/>
@@ -641,7 +641,7 @@
   <xi:include href="swamid-2.0/expertklient.antagning.se-ecs-sp.xml"/>
   <xi:include href="swamid-2.0/gitlab.hird.humlab.umu.se.xml"/>
   <xi:include href="swamid-2.0/antagningsp.slu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/moodle.media.nordu.net.xml"/>
+  <xi:include href="swamid-2.0/moodle.media.nordu.net-.xml"/>
   <xi:include href="swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/klara.port.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/gss-sso.dev.nextcloud.safedc.services-apps-user_saml-saml-metadata.xml"/>