From c26adb57a68205fbe0569345aeddccea0a240d5b Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Mon, 4 Aug 2014 11:31:04 +0200
Subject: [PATCH] fixed some problems with unescaped strings

---
 etc/vagrant/bootstrap.sh | 170 +++++++++++++++++++--------------------
 1 file changed, 85 insertions(+), 85 deletions(-)

diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 3c81189b..aa9d4a5b 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -64,43 +64,43 @@ fi
 # General configuration
 ###########################
 
-CACHE_DIR_LOCAL=/tmp/vagrant-cache
-CACHE_DIR_REMOTE=http://www.krismer.de/files/PhD
-DEPLOY_DIR=/opt
-DOWNLOAD_DIR=$CACHE_DIR_LOCAL/wget
-SHARED_CONF_DIR=/setup/conf
-SHARED_IMG_DIR=/setup/img
-
-CMAKE_VERSION=2.8.12.1
-CMAKE_VERSION_MAIN=v2.8
-CMAKE_FILE=cmake-$CMAKE_VERSION.tar.gz
-GEOSERVER_VERSION=2.5.2
-GEOSERVER_FILE=geoserver-$GEOSERVER_VERSION-war.zip
-GEOSERVER_SHELL_VERSION=0.2-SNAPSHOT
-GEOSERVER_SHELL_FILE=gs-shell-$GEOSERVER_SHELL_VERSION-app.zip
-JAVA_VERSION=8u5
-JAVA_FILE_32=jdk-$JAVA_VERSION-linux-i586.rpm
-JAVA_FILE_64=jdk-$JAVA_VERSION-linux-x64.rpm
-JAVA_CRYPTO_FILE=jce_policy-8.zip
-MAVEN_VERSION=3.2.1
-MAVEN_FILE=apache-maven-$MAVEN_VERSION-bin.zip
-NEO4J_DB_USER=neo4j
-NEO4J_VERSION=2.1.2
-NEO4J_FILE=neo4j-community-$NEO4J_VERSION-unix.tar.gz
-NEO4J_SERVICE_NAME=neo4j-service
-NEO4J_SPATIAL_VERSION=0.13-neo4j-2.0.1
-NEXUS_ARTIFACT_NAME=isochrone-web
-NEXUS_BASE_URL_DBIS=http://138.232.66.78/nexus
-NEXUS_BASE_URL_KRISMER=https://server.krismer.de/nexus
-NEXUS_BASE_URL=$NEXUS_BASE_URL_DBIS
-NEXUS_PUBLIC_REPO=isochrone
-#NEXUS_BASE_URL=$NEXUS_BASE_URL_KRISMER
-#NEXUS_PUBLIC_REPO=public
-NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=RELEASE&p=war
-#NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=0.2.2&p=war
-NEXUS_RELEASE_CANIGET2=https://server.krismer.de/nexus/service/local/artifact/maven/content?r=public&g=de.krismer&a=CanIGet2&v=0.1&p=war
-NEXUS_SNAPSHOT_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=LATEST&p=war
-NEXUS_YUM_REPO=http://www.krismer.de/files/krismer.repo
+CACHE_DIR_LOCAL="/tmp/vagrant-cache"
+CACHE_DIR_REMOTE="http://www.krismer.de/files/PhD"
+DEPLOY_DIR="/opt"
+DOWNLOAD_DIR="$CACHE_DIR_LOCAL/wget"
+SHARED_CONF_DIR="/setup/conf"
+SHARED_IMG_DIR="/setup/img"
+
+CMAKE_VERSION="2.8.12.1"
+CMAKE_VERSION_MAIN="v2.8"
+CMAKE_FILE="cmake-$CMAKE_VERSION.tar.gz"
+GEOSERVER_VERSION="2.5.2"
+GEOSERVER_FILE="geoserver-$GEOSERVER_VERSION-war.zip"
+GEOSERVER_SHELL_VERSION="0.2-SNAPSHOT"
+GEOSERVER_SHELL_FILE="gs-shell-$GEOSERVER_SHELL_VERSION-app.zip"
+JAVA_VERSION="8u5"
+JAVA_FILE_32="jdk-$JAVA_VERSION-linux-i586.rpm"
+JAVA_FILE_64="jdk-$JAVA_VERSION-linux-x64.rpm"
+JAVA_CRYPTO_FILE="jce_policy-8.zip"
+MAVEN_VERSION="3.2.1"
+MAVEN_FILE="apache-maven-$MAVEN_VERSION-bin.zip"
+NEO4J_DB_USER="neo4j"
+NEO4J_VERSION="2.1.2"
+NEO4J_FILE="neo4j-community-$NEO4J_VERSION-unix.tar.gz"
+NEO4J_SERVICE_NAME="neo4j-service"
+NEO4J_SPATIAL_VERSION="0.13-neo4j-2.0.1"
+NEXUS_ARTIFACT_NAME="isochrone-web"
+NEXUS_BASE_URL_DBIS="http://138.232.66.78/nexus"
+NEXUS_BASE_URL_KRISMER="https://server.krismer.de/nexus"
+NEXUS_BASE_URL="$NEXUS_BASE_URL_DBIS"
+NEXUS_PUBLIC_REPO="isochrone"
+#NEXUS_BASE_URL="$NEXUS_BASE_URL_KRISMER"
+#NEXUS_PUBLIC_REPO="public"
+NEXUS_RELEASE_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=RELEASE&p=war"
+#NEXUS_RELEASE_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=0.2.2&p=war"
+NEXUS_RELEASE_CANIGET2="https://server.krismer.de/nexus/service/local/artifact/maven/content?r=public&g=de.krismer&a=CanIGet2&v=0.1&p=war"
+NEXUS_SNAPSHOT_ISOCHRONE="$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=at.uibk.dbis&a=$NEXUS_ARTIFACT_NAME&v=LATEST&p=war"
+NEXUS_YUM_REPO="http://www.krismer.de/files/krismer.repo"
 #OSM_BBOX_BZ="top=46.5200 left=11.3000 bottom=46.4500 right=11.3873"
 #OSM_BBOX_IBK="top=47.3592 left=11.3020 bottom=47.2108 right=11.4554"
 OSM_BBOX_BZ="${SHARED_CONF_DIR}/poly_bz.poly"
@@ -108,45 +108,45 @@ OSM_BBOX_IBK="${SHARED_CONF_DIR}/poly_ibk.poly"
 OSM_BBOX_IT="${SHARED_CONF_DIR}/poly_it.poly"
 OSM_BBOX_SF="${SHARED_CONF_DIR}/poly_sf.poly"
 OSM_BBOX_ST="${SHARED_CONF_DIR}/poly_st.poly" #also referred to as poly_taa.poly
-OSM_FILE_AUSTRIA=europe/austria-140301.osm.pbf
-OSM_FILE_ITALY=europe/italy-140301.osm.pbf
-OSM_FILE_CALIFORNIA=north-america/us/california-140301.osm.pbf
-OSM_FILE_BZ_FILTERED=bozen-140301-filtered.osm
-OSM_FILE_IBK_FILTERED=innsbruck-140301-filtered.osm
-OSM_FILE_IT_FILTERED=italy-140301-filtered.osm
-OSM_FILE_SF_FILTERED=sanfrancisco-140301-filtered.osm
-OSM_FILE_ST_FILTERED=southtyrol-140301-filtered.osm
+OSM_FILE_AUSTRIA="europe/austria-140301.osm.pbf"
+OSM_FILE_ITALY="europe/italy-140301.osm.pbf"
+OSM_FILE_CALIFORNIA="north-america/us/california-140301.osm.pbf"
+OSM_FILE_BZ_FILTERED="bozen-140301-filtered.osm"
+OSM_FILE_IBK_FILTERED="innsbruck-140301-filtered.osm"
+OSM_FILE_IT_FILTERED="italy-140301-filtered.osm"
+OSM_FILE_SF_FILTERED="sanfrancisco-140301-filtered.osm"
+OSM_FILE_ST_FILTERED="southtyrol-140301-filtered.osm"
 OSM_KEYS="aerialway,highway,public_transport,railway,route"
-OSM2PGROUTING_VERSION=v2.0.0
-OSM2PGROUTING_MAPPING_CONF=$DEPLOY_DIR/osm2pgrouting/mapconfig.xml
-OSMOSIS_VERSION=0.43.1
-OSMOSIS_FILE=osmosis-$OSMOSIS_VERSION.zip
-POSTGIS_VERSION=2.1.3
-POSTGRESQL_DATA_DIR=/var/lib/pgsql/9.3/data
-POSTGRESQL_HBA_CONF=$POSTGRESQL_DATA_DIR/pg_hba.conf
-POSTGRESQL_PKG_NAME=postgresql93
-POSTGRESQL_REPO_RPM_32=http://yum.postgresql.org/9.3/fedora/fedora-20-i386/pgdg-fedora93-9.3-1.noarch.rpm
-POSTGRESQL_REPO_RPM_64=http://yum.postgresql.org/9.3/fedora/fedora-20-x86_64/pgdg-fedora93-9.3-1.noarch.rpm
-POSTGRESQL_SERVICE_NAME=postgresql-9.3
-PGROUTING_VERSION=2.0.0
-REPO_BASE_CONFIG=/etc/yum.repos.d/fedora-updates.repo
-REPO_RPMFORGE_CONFIG=/etc/yum.repos.d/rpmforge.repo
-REPO_RPMFORGE_URL_32=http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.i686.rpm
-REPO_RPMFORGE_URL_64=http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm
-TABLE_PREFIX_BZ=bz_
-TABLE_PREFIX_IBK=ibk_
-TABLE_PREFIX_IT=it_
-TABLE_PREFIX_SF=sf_
-TABLE_PREFIX_ST=st_
-TEMPLATE_VERSION_PSIPROBE=2.3.3
-TEMPLATE_FILE_PSIPROBE=probe-$TEMPLATE_VERSION_PSIPROBE.zip
-TEMPLATE_DIR_ISOCHRONE=/vagrant
-TOMCAT_VERSION=8.0.9
-TOMCAT_FILE=apache-tomcat-$TOMCAT_VERSION.tar.gz
+OSM2PGROUTING_VERSION="v2.0.0"
+OSM2PGROUTING_MAPPING_CONF="$DEPLOY_DIR/osm2pgrouting/mapconfig.xml"
+OSMOSIS_VERSION="0.43.1"
+OSMOSIS_FILE="osmosis-$OSMOSIS_VERSION.zip"
+POSTGIS_VERSION="2.1.3"
+POSTGRESQL_DATA_DIR="/var/lib/pgsql/9.3/data"
+POSTGRESQL_HBA_CONF="$POSTGRESQL_DATA_DIR/pg_hba.conf"
+POSTGRESQL_PKG_NAME="postgresql93"
+POSTGRESQL_REPO_RPM_32="http://yum.postgresql.org/9.3/fedora/fedora-20-i386/pgdg-fedora93-9.3-1.noarch.rpm"
+POSTGRESQL_REPO_RPM_64="http://yum.postgresql.org/9.3/fedora/fedora-20-x86_64/pgdg-fedora93-9.3-1.noarch.rpm"
+POSTGRESQL_SERVICE_NAME="postgresql-9.3"
+PGROUTING_VERSION="2.0.0"
+REPO_BASE_CONFIG="/etc/yum.repos.d/fedora-updates.repo"
+REPO_RPMFORGE_CONFIG="/etc/yum.repos.d/rpmforge.repo"
+REPO_RPMFORGE_URL_32="http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.i686.rpm"
+REPO_RPMFORGE_URL_64="http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm"
+TABLE_PREFIX_BZ="bz_"
+TABLE_PREFIX_IBK="ibk_"
+TABLE_PREFIX_IT="it_"
+TABLE_PREFIX_SF="sf_"
+TABLE_PREFIX_ST="st_"
+TEMPLATE_VERSION_PSIPROBE="2.3.3"
+TEMPLATE_FILE_PSIPROBE="probe-$TEMPLATE_VERSION_PSIPROBE.zip"
+TEMPLATE_DIR_ISOCHRONE="/vagrant"
+TOMCAT_VERSION="8.0.9"
+TOMCAT_FILE="apache-tomcat-$TOMCAT_VERSION.tar.gz"
 TOMCAT_MEMORY_OPTS="-Xmx2048m -Xms512m -XX:MaxPermSize=512m"
-TOMCAT_NAME=tomcat
-TOMCAT_USER=tomcat
-TOPOLOGY_TOLERANCE=0.0005
+TOMCAT_NAME="tomcat"
+TOMCAT_USER="tomcat"
+TOPOLOGY_TOLERANCE="0.0005"
 
 ## Calculated variables
 #######################
@@ -179,9 +179,9 @@ fi
 
 DISTRI=$(cat /etc/issue | head -n 1 | cut -d " " -f 1)
 if [ $DISTRI == "CentOS" ]; then
-	POSTGRESQL_REPO_RPM_32=http://yum.postgresql.org/9.3/redhat/rhel-6-i386/pgdg-centos93-9.3-1.noarch.rpm
-	POSTGRESQL_REPO_RPM_64=http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-centos93-9.3-1.noarch.rpm
-	REPO_BASE_CONFIG=/etc/yum.repos.d/CentOS-Base.repo
+	POSTGRESQL_REPO_RPM_32="http://yum.postgresql.org/9.3/redhat/rhel-6-i386/pgdg-centos93-9.3-1.noarch.rpm"
+	POSTGRESQL_REPO_RPM_64="http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-centos93-9.3-1.noarch.rpm"
+	REPO_BASE_CONFIG="/etc/yum.repos.d/CentOS-Base.repo"
 elif [ $DISTRI != "Fedora" ]; then
 	echo "Unsupported OS. Only CentOS and Fedora are supported!"
 	exit 1;
@@ -193,17 +193,17 @@ if [ "x86_64" == $(uname -m) ]; then
 fi
 
 if $IS_64_BIT; then
-	POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_64
-	REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_64
-	JAVA_FILE=$JAVA_FILE_64
+	POSTGRESQL_REPO_RPM="$POSTGRESQL_REPO_RPM_64"
+	REPO_RPMFORGE_URL="$REPO_RPMFORGE_URL_64"
+	JAVA_FILE="$JAVA_FILE_64"
 else
-	POSTGRESQL_REPO_RPM=$POSTGRESQL_REPO_RPM_32
-	REPO_RPMFORGE_URL=$REPO_RPMFORGE_URL_32
-	JAVA_FILE=$JAVA_FILE_32
+	POSTGRESQL_REPO_RPM="$POSTGRESQL_REPO_RPM_32"
+	REPO_RPMFORGE_URL="$REPO_RPMFORGE_URL_32"
+	JAVA_FILE="$JAVA_FILE_32"
 fi
 
 START=$(date +%s)
-TOMCAT_WEBAPP_DIR=$DEPLOY_DIR/$TOMCAT_NAME/webapps
+TOMCAT_WEBAPP_DIR="$DEPLOY_DIR/$TOMCAT_NAME/webapps"
 WORKING_DIR=`pwd`
 
 ## Functions
@@ -535,7 +535,7 @@ fi
 
 if $INSTALL_ISOCHRONE_SNAPSHOT; then
 	echo "Installing template project \"isochrone (testing)\""
-	echo " - artifact: $NEXUS_RELEASE_ISOCHRONE"
+	echo " - artifact: $NEXUS_SNAPSHOT_ISOCHRONE"
 
 	# we do not save this file in download dir (we do not want caching for testing.war)
 	fn_download $DOWNLOAD_DIR/testing.war $NEXUS_SNAPSHOT_ISOCHRONE
-- 
GitLab