From 2c0805037bb5a8ea798d34a25ade5fd9d717bdba Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Mon, 21 Jul 2014 15:56:19 +0200
Subject: [PATCH] minor improvements
---
build.gradle | 8 +++-----
etc/vagrant/bootstrap.sh | 20 ++++++++++----------
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/build.gradle b/build.gradle
index fe027f9b..64e6b108 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,14 +140,12 @@ dependencies {
// testCompile 'org.apache.jmeter:ApacheJMeter:2.+'
}
-tasks.withType(JavaCompile) {
- // adds support for compiler warnings generation
- options.compilerArgs << '-Xlint:all,-processing'
-}
-
tasks.withType(JavaCompile) {
// workaround for http://issues.gradle.org/browse/GRADLE-1230
doFirst { println '' }
+
+ // adds support for compiler warnings generation
+ options.compilerArgs << '-Xlint:all,-processing'
}
asciidoctor {
diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh
index 89c19ab5..c3c6e631 100644
--- a/etc/vagrant/bootstrap.sh
+++ b/etc/vagrant/bootstrap.sh
@@ -211,8 +211,8 @@ WORKING_DIR=`pwd`
fn_download()
{
- FILE=$1
- URL=$2
+ FILE="$1"
+ URL="$2"
if wget --no-check-certificate -q -O /dev/null "$URL"; then
wget --no-check-certificate -q -O "$FILE" "$URL"
@@ -222,8 +222,8 @@ fn_download()
# "wget -N" does not work with "-O" option... so we use a workaround here
fn_download_newer()
{
- FILE=$1
- URL=$2
+ FILE="$1"
+ URL="$2"
if [ ! -f "$FILE" ]; then
if wget --no-check-certificate -q -O /dev/null "$URL"; then
@@ -234,12 +234,12 @@ fn_download_newer()
fn_import_data()
{
- NAME=$1
- OSM_FILE=$2
- OSM_FILE_FILTERED=$3
- BOUNDING=$4
- SCHEDULE_FILE=$5
- TABLE_PREFIX=$6
+ NAME="$1"
+ OSM_FILE="$2"
+ OSM_FILE_FILTERED="$3"
+ BOUNDING="$4"
+ SCHEDULE_FILE="$5"
+ TABLE_PREFIX="$6"
echo "Importing data for region of $NAME"
if $IMPORT_OSMDATA_CACHED; then
--
GitLab