From 4e67ab6b68c4ca3679ce24592899b8ca2908f7be Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 7 Jan 2020 12:59:13 +0000 Subject: [PATCH] JAL-3477 Fixed appbase override so it's optional\! --- build.gradle | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1e26bee..a8315c2 100644 --- a/build.gradle +++ b/build.gradle @@ -56,10 +56,12 @@ ext { localPropsFIS.close() p.each { key, val -> - def over = getProperty(key) != null + def oldval = findProperty(key) setProperty(key, val) - if (over) { - println("Overriding property '${key}' with local.properties value '${val}'") + if (oldval != null) { + println("Overriding property '${key}' ('${oldval}') with local.properties value '${val}'") + } else { + println("Setting unknown property '${key}' with local.properties value '${val}'") } } } catch (Exception e) { @@ -214,7 +216,7 @@ ext { } // override getdown_app_base if requested - if (getProperty("getdown_appbase_override") != null) { + if (findProperty("getdown_appbase_override") != null) { getdown_app_base = string(getProperty("getdown_appbase_override")) println("Overriding getdown appbase with '${getdown_app_base}'") } -- 1.7.10.2