From 9e91a1b607fef0bb41d325e99361b350da2a6f04 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <niko@krismer.de>
Date: Sun, 25 May 2014 00:15:02 +0200
Subject: [PATCH] tried to fix variable state confusion (length of variable
 string minimized)

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

diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 30cc96fe..22f66f55 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -36,11 +36,11 @@ IS_LOCAL_TEST_DEPLOY=false
 # will install caniget2 sample project
 INSTALL_PROJECT_CANIGET2=false
 # will install isochrone from vagrant start directory (eclipse project)
-INSTALL_PROJECT_ISOCHRONE_LOCAL=true
+INSTALL_ISOCHRONE_LOCAL=true
 # will install latest isochrone release from nexus repository
-INSTALL_PROJECT_ISOCHRONE_RELEASE=true
+INSTALL_ISOCHRONE_RELEASE=true
 # will install latest isochrone snapshot from nexus repository
-INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=true
+INSTALL_ISOCHRONE_SNAPSHOT=true
 INSTALL_PROJECT_PSIPROBE=true
 
 PG_DB_NAME="isochrone"
@@ -156,11 +156,11 @@ INSTALL_TOMCAT=false
 
 if $IS_LOCAL_TEST_DEPLOY; then
 	INSTALL_PROJECT_CANIGET2=false
-	INSTALL_PROJECT_ISOCHRONE_LOCAL=false
-	INSTALL_PROJECT_ISOCHRONE_RELEASE=false
-	INSTALL_PROJECT_ISOCHRONE_SNAPSHOT=false
+	INSTALL_ISOCHRONE_LOCAL=false
+	INSTALL_ISOCHRONE_RELEASE=false
+	INSTALL_ISOCHRONE_SNAPSHOT=false
 fi
-if $INSTALL_GEOSERVER || $INSTALL_PROJECT_CANIGET2 || $INSTALL_PROJECT_ISOCHRONE_LOCAL || $INSTALL_PROJECT_ISOCHRONE_RELEASE || $INSTALL_PROJECT_ISOCHRONE_SNAPSHOT || $INSTALL_PROJECT_PSIPROBE; then
+if $INSTALL_GEOSERVER || $INSTALL_PROJECT_CANIGET2 || $INSTALL_ISOCHRONE_LOCAL || $INSTALL_ISOCHRONE_RELEASE || $INSTALL_ISOCHRONE_SNAPSHOT || $INSTALL_PROJECT_PSIPROBE; then
 	INSTALL_TOMCAT=true
 fi
 if $INSTALL_NEO4J_SPATIAL; then
@@ -321,9 +321,9 @@ if $IMPORT_OSMDATA; then echo "  - osmosis $OSMOSIS_VERSION"; fi
 if $IMPORT_OSMDATA_CACHED; then echo "Importing cached data from OSM (if possible)"; elif $IMPORT_OSMDATA; then echo "Importing data from OSM"; fi
 if $IMPORT_SCHEDULES; then echo "Importing schedules"; fi
 if $INSTALL_PROJECT_CANIGET2; then echo "Importing project \"CanIGet2\""; fi
-if $INSTALL_PROJECT_ISOCHRONE_LOCAL; then echo "Importing project \"isochrone (local testing)\""; fi
-if $INSTALL_PROJECT_ISOCHRONE_RELEASE; then echo "Importing project \"isochrone (release)\""; fi
-if $INSTALL_PROJECT_ISOCHRONE_SNAPSHOT; then echo "Importing project \"isochrone (testing)\""; fi
+if $INSTALL_ISOCHRONE_LOCAL; then echo "Importing project \"isochrone (local testing)\""; fi
+if $INSTALL_ISOCHRONE_RELEASE; then echo "Importing project \"isochrone (release)\""; fi
+if $INSTALL_ISOCHRONE_SNAPSHOT; then echo "Importing project \"isochrone (testing)\""; fi
 if $INSTALL_PROJECT_PSIPROBE; then echo "Importing project \"psi-probe\""; fi
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo " Performing installations:"
@@ -517,13 +517,13 @@ if $INSTALL_PROJECT_CANIGET2; then
 	rm -f $TOMCAT_WEBAPP_DIR/caniget2.war >> install_caniget2.log 2>&1
 fi
 
-if $INSTALL_PROJECT_ISOCHRONE_LOCAL; then
+if $INSTALL_ISOCHRONE_LOCAL; then
 	echo "Installing template project \"isochrone (local testing)\""
 	$TEMPLATE_DIR_ISOCHRONE/gradlew -b $TEMPLATE_DIR_ISOCHRONE/build.gradle -c $TEMPLATE_DIR_ISOCHRONE/settings.gradle clean war > install_isochrone_local.log 2>&1
 	unzip -o -d $TOMCAT_WEBAPP_DIR/localTesting $TEMPLATE_DIR_ISOCHRONE/build/libs/isochrone-*.war >> install_isochrone_local.log 2>&1
 fi
 
-if $INSTALL_PROJECT_ISOCHRONE_RELEASE; then
+if $INSTALL_ISOCHRONE_RELEASE; then
 	echo "Installing template project \"isochrone (release)\""
 	# we do not save this file in download dir (we do not want caching for isochrone.war)
 	fn_download_newer $TOMCAT_WEBAPP_DIR/isochrone.war $NEXUS_RELEASE_ISOCHRONE
@@ -531,7 +531,7 @@ if $INSTALL_PROJECT_ISOCHRONE_RELEASE; then
 	rm -f $TOMCAT_WEBAPP_DIR/isochrone.war >> install_isochrone_release.log 2>&1
 fi
 
-if $INSTALL_PROJECT_ISOCHRONE_SNAPSHOT; then
+if $INSTALL_ISOCHRONE_SNAPSHOT; then
 	echo "Installing template project \"isochrone (testing)\""
 	# we do not save this file in download dir (we do not want caching for testing.war)
 	fn_download_newer $TOMCAT_WEBAPP_DIR/testing.war $NEXUS_SNAPSHOT_ISOCHRONE
-- 
GitLab