From 951d5d4f350980fa80126b6876648be822832412 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <bjorn@sunet.se>
Date: Mon, 5 Dec 2022 16:04:47 -0700
Subject: Added LC_ALL sort to get files in same order on both MacOS and Linuc

---
 scripts/create_mxml.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/create_mxml.sh b/scripts/create_mxml.sh
index b4ac501e..bb7855d5 100755
--- a/scripts/create_mxml.sh
+++ b/scripts/create_mxml.sh
@@ -16,7 +16,7 @@ cat << EOF > swamid-edugain-idp-1.0.mxml
                        xmlns:xi="http://www.w3.org/2001/XInclude" 
                        Name="http://md.swamid.se/md/swamid-idp-2.0.xml">
 EOF
-grep -l IDPSSO swamid-edugain/*.xml | while read file; do
+grep -l IDPSSO swamid-edugain/*.xml | LC_ALL=C  sort | while read file; do
 	echo "  <xi:include href=\"$file\"/>" >> swamid-edugain-idp-1.0.mxml
 done
 echo "</md:EntitiesDescriptor>" >> swamid-edugain-idp-1.0.mxml
@@ -25,7 +25,7 @@ cat << EOF > swamid-edugain-sp-1.0.mxml
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmeta="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0">
 EOF
-grep -l SPSSO swamid-edugain/*.xml  | grep -v "`grep -l IDPSSO swamid-edugain/*.xml`" | while read file; do
+grep -l SPSSO swamid-edugain/*.xml  | grep -v "`grep -l IDPSSO swamid-edugain/*.xml`" | LC_ALL=C  sort | while read file; do
 	echo "  <xi:include href=\"$file\"/>" >> swamid-edugain-sp-1.0.mxml
 done
 echo "</md:EntitiesDescriptor>" >> swamid-edugain-sp-1.0.mxml
@@ -42,7 +42,7 @@ cat << EOF > swamid-idp-2.0.mxml
 
   <!-- Opt-out from eduGAIN IDP:s -->
 EOF
-grep -l IDPSSO swamid-2.0/*.xml | while read file; do
+grep -l IDPSSO swamid-2.0/*.xml | LC_ALL=C  sort | while read file; do
 	echo "  <xi:include href=\"$file\"/>" >> swamid-idp-2.0.mxml
 done
 echo "</md:EntitiesDescriptor>" >> swamid-idp-2.0.mxml
@@ -54,7 +54,7 @@ cat << EOF > swamid-sp-2.0.mxml
 
   <!-- Opt-out from eduGAIN SP:s -->
 EOF
-grep -l SPSSO swamid-2.0/*.xml  | grep -v "`grep -l IDPSSO swamid-2.0/*.xml`" | while read file; do
+grep -l SPSSO swamid-2.0/*.xml  | grep -v "`grep -l IDPSSO swamid-2.0/*.xml`" | LC_ALL=C  sort | while read file; do
 	echo "  <xi:include href=\"$file\"/>" >> swamid-sp-2.0.mxml
 done
 echo "</md:EntitiesDescriptor>" >> swamid-sp-2.0.mxml
@@ -66,7 +66,7 @@ cat << EOF > swamid-testing-idp-1.0.mxml
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-testing-idp-1.0.xml">
 EOF
-egrep -l "AttributeAuthorityDescriptor|IDPSSODescriptor" swamid-testing/*.xml | while read file; do
+egrep -l "AttributeAuthorityDescriptor|IDPSSODescriptor" swamid-testing/*.xml | LC_ALL=C  sort | while read file; do
 	echo "  <xi:include href=\"$file\"/>" >> swamid-testing-idp-1.0.mxml
 done
 echo "</EntitiesDescriptor>" >> swamid-testing-idp-1.0.mxml
@@ -75,7 +75,7 @@ cat << EOF > swamid-testing-sp-1.0.mxml
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-testing-sp-1.0.xml">
 EOF
-grep -l SPSSO swamid-testing/*.xml  | grep -v "`egrep -l "AttributeAuthorityDescriptor|IDPSSODescriptor" swamid-testing/*.xml`" | while read file; do
+grep -l SPSSO swamid-testing/*.xml  | grep -v "`egrep -l "AttributeAuthorityDescriptor|IDPSSODescriptor" swamid-testing/*.xml`" | LC_ALL=C  sort | while read file; do
 	echo "  <xi:include href=\"$file\"/>" >> swamid-testing-sp-1.0.mxml
 done
 echo "</EntitiesDescriptor>" >> swamid-testing-sp-1.0.mxml
-- 
cgit v1.2.3