removing remote cache for geoserver-shell

CHANGELOG.md

 Upcoming version:
 -----------------
+  - removing remote cache for geoserver-shell (Nikolaus Krismer)
   - improved coloring; improved exception handling; downloading java from OTN now (Nikolaus Krismer)
   - changes due to rename in isochrone-datamodel (Nikolaus Krismer)
   - version updates (Nikolaus Krismer)

bootstrap/config.sh

@@ -21,9 +21,7 @@ TARGET_SRID="3857"
 UPDATE_DATA=false
 
 CACHE_DIR_LOCAL="/tmp/vagrant-cache"
-CACHE_DIR_REMOTE="https://dbis-owncloud.uibk.ac.at"
-CACHE_DIR_REMOTE_ISO="${CACHE_DIR_REMOTE}/index.php/s/C6OdFprXW71ugNW/download?path=%2F&files="
-CACHE_DIR_REMOTE_DATA="${CACHE_DIR_REMOTE}/index.php/s/kgjm3CItQJ6P374/download?path=%2F2016&files="
+CACHE_DIR_REMOTE="https://dbis-owncloud.uibk.ac.at/index.php/s/kgjm3CItQJ6P374/download?path=%2F2016&files="
 DEPLOY_DIR="/opt"
 DATA_DIR="$DEPLOY_DIR/data"
 SETUP_DIR="/setup"

bootstrap/importData.sh

@@ -124,7 +124,7 @@ function fn_import_dataset_postgis() {
 
 	if ! $UPDATE_DATA; then
 		fn_echo "  - downloading SQL export"
-		fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE "${CACHE_DIR_REMOTE_DATA}${SQL_EXPORT_FILE}"
+		fn_download_newer $DOWNLOAD_DIR/$SQL_EXPORT_FILE "${CACHE_DIR_REMOTE}${SQL_EXPORT_FILE}"
 		cp $DOWNLOAD_DIR/$SQL_EXPORT_FILE $DATA_DIR/$SQL_EXPORT_FILE >> /dev/null 2>&1
 
 		fn_echo "  - importing SQL export into PostGIS database"
@@ -240,7 +240,7 @@ function fn_import_spatialite() {
 	SPATIALITE_FILENAME="isochrone_${SRID}.spatialite"
 	if ! $UPDATE_DATA; then
 		fn_echo "Importing spatialite database"
-		fn_download_newer $DOWNLOAD_DIR/$SPATIALITE_FILENAME "${CACHE_DIR_REMOTE_DATA}${SPATIALITE_FILENAME}"
+		fn_download_newer $DOWNLOAD_DIR/$SPATIALITE_FILENAME "${CACHE_DIR_REMOTE}${SPATIALITE_FILENAME}"
 		cp -f "$DOWNLOAD_DIR/$SPATIALITE_FILENAME" "$DATA_DIR/"
 	fi
 	
@@ -278,7 +278,7 @@ function fn_filter_osm_data() {
 
 	if [ ! -f "$DATA_DIR/$OSM_FILE_FILTERED" ]; then
 		fn_echo "  - downloading cached OpenStreetMap file"
-		fn_download_newer $DOWNLOAD_DIR/$OSM_FILE_FILTERED $CACHE_DIR_REMOTE_DATA/$OSM_FILE_FILTERED
+		fn_download_newer $DOWNLOAD_DIR/$OSM_FILE_FILTERED ${CACHE_DIR_REMOTE}${OSM_FILE_FILTERED}
 		cp $DOWNLOAD_DIR/$OSM_FILE_FILTERED $DATA_DIR/$OSM_FILE_FILTERED >> /dev/null 2>&1
 	fi
 

bootstrap/prepareEnvironment.sh

@@ -84,7 +84,6 @@ GEOSERVER_FILE="geoserver-$GEOSERVER_VERSION-war.zip"
 GEOSERVER_DOWNLOAD_URL="http://sourceforge.net/projects/geoserver/files/GeoServer/$GEOSERVER_VERSION/$GEOSERVER_FILE"
 GEOSERVER_SHELL_VERSION="0.2.1"
 GEOSERVER_SHELL_FILE="geoserver-shell-$GEOSERVER_SHELL_VERSION-app.zip"
-#GEOSERVER_SHELL_URL="${CACHE_DIR_REMOTE_ISO}${GEOSERVER_SHELL_FILE}"
 GEOSERVER_SHELL_URL="https://github.com/jericks/geoserver-shell/releases/download/0.2/$GEOSERVER_SHELL_FILE"
 JAVA_VERSION="8u74"
 JAVA_VERSION_BUILD="8u74-b02"