From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 30 Sep 2008 04:48:10 +0000 (+0000)
Subject: Fix catalog fixup to allow install loc to not overlap with usr/local.
X-Git-Tag: 2.2.0~47
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=commitdiff_plain;h=d424d236e19ce0343f3ea070d0f004f7ef98f551;hp=1538f647c5485e0c00118b92792615c225b4ce9c

Fix catalog fixup to allow install loc to not overlap with usr/local.
---

diff --git a/postinstall b/postinstall
index 1808dee..da3f9ec 100644
--- a/postinstall
+++ b/postinstall
@@ -2,15 +2,15 @@
 
 cd ${CLIENT_BASEDIR}/share/xml/opensaml
 
-sed "s|uri=\".*${CLIENT_BASEDIR}|uri=\"${CLIENT_BASEDIR}|1" saml10-catalog.xml > catalog.xml.tmp
+sed "s|uri=\".*/share/xml/opensaml/\(.*\)\"|uri=\"${CLIENT_BASEDIR}/share/xml/opensaml/\1\"|1" saml10-catalog.xml > catalog.xml.tmp
 mv catalog.xml.tmp saml10-catalog.xml
 chmod 644 saml10-catalog.xml
 
-sed "s|uri=\".*${CLIENT_BASEDIR}|uri=\"${CLIENT_BASEDIR}|1" saml11-catalog.xml > catalog.xml.tmp
+sed "s|uri=\".*/share/xml/opensaml/\(.*\)\"|uri=\"${CLIENT_BASEDIR}/share/xml/opensaml/\1\"|1" saml11-catalog.xml > catalog.xml.tmp
 mv catalog.xml.tmp saml11-catalog.xml
 chmod 644 saml11-catalog.xml
 
-sed "s|uri=\".*${CLIENT_BASEDIR}|uri=\"${CLIENT_BASEDIR}|1" saml20-catalog.xml > catalog.xml.tmp
+sed "s|uri=\".*/share/xml/opensaml/\(.*\)\"|uri=\"${CLIENT_BASEDIR}/share/xml/opensaml/\1\"|1" saml20-catalog.xml > catalog.xml.tmp
 mv catalog.xml.tmp saml20-catalog.xml
 chmod 644 saml20-catalog.xml