changeset 7949:0fa7db25fd67

Avoid having to set VERSION in external script.
author Tom Gottfried <tom@intevation.de>
date Wed, 18 Jun 2014 18:18:04 +0200
parents 36f634917104
children 7668256a36d1
files contrib/make_flys_release/make_release.sh
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/make_flys_release/make_release.sh	Wed Jun 18 16:34:08 2014 +0200
+++ b/contrib/make_flys_release/make_release.sh	Wed Jun 18 18:18:04 2014 +0200
@@ -65,7 +65,7 @@
 #   --seddb-pass                    Sediment db password. Default: $SEDDBPASS
 #   --seddb-back                    Sediment db backend. Default: $SEDDBBACK
 TOMCAT_PORT=${TOMCAT_PORT:-8282}
-MAPSERVER_URL=${MAPSERVER_URL:-http://flys-devel.intevation.de/cgi-bin/flys-${VERSION}}
+MAPSERVER_URL=${MAPSERVER_URL:-http://flys-devel.intevation.de/cgi-bin/flys}
 WIKI_URL=${WIKI_URL:-https://flys3-devel.bafg.de/wiki}
 # Prefix to FreeSans.ttf
 FONT_PATH=${FONT_PATH:-/opt/flys}
@@ -324,10 +324,10 @@
 sed -i "s/8181/$ARTIFACT_PORT/g" \
     $WORK_DIR/server/conf/rest-server.xml
 
-sed -i -e "s@http://yourhost:8081/cgi-bin@${MAPSERVER_URL}/@g" \
+sed -i -e "s@http://yourhost:8081/cgi-bin@${MAPSERVER_URL}-${VERSION}@g" \
     $WORK_DIR/server/conf/floodmap.xml
 
-sed -i -e "s@http://yourhost:8081/cgi-bin@${MAPSERVER_URL}/@g" \
+sed -i -e "s@http://yourhost:8081/cgi-bin@${MAPSERVER_URL}-${VERSION}@g" \
     $WORK_DIR/server/conf/rivermap.xml
 
 sed -i -e "s@/usr/share/fonts/truetype/freefont@${FONT_PATH}@g" \

http://dive4elements.wald.intevation.org