changeset 5325:53aee7e9ce53

Be more aggressive when replacing the wiki url
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 15 Mar 2013 19:28:35 +0100 (2013-03-15)
parents 807fa01b498b
children 555835611acd
files contrib/make_flys_release/make_release.sh
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/make_flys_release/make_release.sh	Fri Mar 15 19:00:49 2013 +0100
+++ b/contrib/make_flys_release/make_release.sh	Fri Mar 15 19:28:35 2013 +0100
@@ -185,8 +185,11 @@
 sed -i -e "s@/tmp/flys-client.log@${LOG_DIR}/client-${VERSION}.log@g" \
     $FLYS_SOURCE_DIR/flys/flys-client/src/main/webapp/WEB-INF/log4j.properties
 
-find $FLYS_SOURCE_DIR/flys/flys-artifacts/src/main/resources/ -name messages_\*.properties \
-    -exec sed -i "s@https://flys-intern.intevation.de/Flys-3.0@"'${WIKI_URL}'"@g" {} \;
+find $FLYS_SOURCE_DIR/flys/flys-artifacts/src/main/resources/ -name messages\*.properties | \
+    xargs sed -i "s@https://flys-intern.intevation.de/Flys-3.0@${WIKI_URL}@g";
+
+find $FLYS_SOURCE_DIR/flys/ -name \*.properties -o -name \*.xsl |  \
+    xargs sed -i "s@https://flys-intern.intevation.de@${WIKI_URL}@g";
 
 if [ ! -f $FLYS_SOURCE_DIR/OpenLayers-2.11.tar.gz ]; then
     echo "INFO: download OpenLayers-2.11 for client"
@@ -258,10 +261,10 @@
 sed -i -e "s@http://example.com/@http://${MAPSERVER_URL}/@g" \
     $WORK_DIR/server/conf/rivermap.xml
 
-sed -i -e "s@/tmp/flys-rivers-wms.log/@${LOG_DIR}/rivers-wms-${VERSION}.log@g" \
+sed -i -e "s@/tmp/flys-rivers-wms.log@${LOG_DIR}/rivers-wms-${VERSION}.log@g" \
     $WORK_DIR/server/conf/mapserver/river-mapfile.vm
 
-sed -i -e "s@/tmp/flys-user-wms.log/@${LOG_DIR}/user-wms-${VERSION}.log@g" \
+sed -i -e "s@/tmp/flys-user-wms.log@${LOG_DIR}/user-wms-${VERSION}.log@g" \
     $WORK_DIR/server/conf/mapserver/mapfile.vm
 
 sed "s@/tmp/flys-server-default.log@${LOG_DIR}/server-${VERSION}.log@" \

http://dive4elements.wald.intevation.org