From f5da13d3b41cd81dad677cae31d967081076bca0 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 10 Jul 2018 16:59:07 +0200
Subject: [PATCH] Updated ant-kit. To be used by Windows and Mac build as well

---
 main/ant-kit/src/main/resources/build.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml
index aae41cbe3..15d6e5b4d 100644
--- a/main/ant-kit/src/main/resources/build.xml
+++ b/main/ant-kit/src/main/resources/build.xml
@@ -21,27 +21,30 @@
 		</fx:jar>
 	</target>
 
-	<!-- Create Image package -->
+	<!-- Create Image -->
 	<target name="image" depends="create-jar">
+		<property environment="env"/>
+
 		<fx:deploy nativeBundles="image" outdir="antbuild" verbose="true">
 			<fx:application refid="Cryptomator" />
 			<fx:info title="Cryptomator" vendor="cryptomator.org" copyright="cryptomator.org" license="GPL" category="Utility"/>
 			<fx:platform j2se="9.0">
-				<fx:property name="logback.configurationFile" value="logback.xml" />
-				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
-				<fx:property name="cryptomator.ipcPortPath" value="~/.Cryptomator/ipcPort.bin" />
+				<fx:property name="logback.configurationFile" value="${env.antbuild.logback.configurationFile}" />
+				<fx:property name="cryptomator.settingsPath" value="${env.antbuild.cryptomator.settingsPath}" />
+				<fx:property name="cryptomator.ipcPortPath" value="${env.antbuild.cryptomator.ipcPortPath}" />
+				<fx:property name="cryptomator.keychainPath" value="${env.antbuild.cryptomator.keychainPath}"/>
 				<fx:jvmarg value="-Xss2m"/>
 				<fx:jvmarg value="-Xmx512m"/>
 				<fx:jvmarg value="--add-modules"/>
 				<fx:jvmarg value="jdk.incubator.httpclient"/>
 			</fx:platform>
 			<fx:resources>
-				<fx:fileset dir="." type="data" includes="logback.xml" />
 				<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />
 				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="launcher-${project.version}.jar"/>
 			</fx:resources>
 			<fx:permissions elevated="false" />
 			<fx:preferences install="true" />
+			<fx:bundleArgument arg="dropinResourcesRoot" value="${env.antbuild.dropinResourcesRoot}"/>
 		</fx:deploy>
 	</target>