From 8684238b3166614ae1e810135e8332098170bbc3 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 27 Nov 2016 22:02:22 +0800
Subject: [PATCH] Fix portable startup config

---
 installer/portable/FileBot.l4j.ini | 35 +++++++++++++++---------------
 installer/portable/filebot.cmd     |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/installer/portable/FileBot.l4j.ini b/installer/portable/FileBot.l4j.ini
index cce97706..315edf69 100644
--- a/installer/portable/FileBot.l4j.ini
+++ b/installer/portable/FileBot.l4j.ini
@@ -1,31 +1,32 @@
 # FileBot launch4j runtime config
+-Dapplication.dir="%EXEDIR%\data"
 -Dapplication.deployment=portable
--Dapplication.dir="%EXEDIR%"
--Duser.home="%EXEDIR%"
+
+-Duser.home="%EXEDIR%\data"
+-Djava.io.tmpdir="%EXEDIR%\data\tmp"
 
 # network settings
 -Djava.net.useSystemProxies=false
 
-# do not use native shell for move/copy operations
+# use Windows Shell for move/copy operations
 -DuseNativeShell=false
 
-# do not use NTFS extended attributes for storing metadata
+# use NTFS extended attributes for storing metadata
 -DuseExtendedFileAttributes=true
 -DuseCreationDate=false
 
-# put all temporary files here
--Djava.io.tmpdir="%EXEDIR%\temp"
-
-# look for native libs here
--Djna.library.path="%EXEDIR%"
--Djava.library.path="%EXEDIR%"
-
-# do not use any JNA libs that are already installed
--Djna.nosys=true
-
-# look for fpcalc here
+# look for executables in the application folder
 -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
 
-# store preferences to text file
+# look for native libraries in the application folder
+-Djna.library.path="%EXEDIR%"
+-Djna.boot.library.path="%EXEDIR%"
+-Djava.library.path="%EXEDIR%"
+
+# make sure to use the bundled JNA library
+-Djna.nosys=true
+-Djna.nounpack=true
+
+# store preferences in properties file
 -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory
--Dnet.filebot.util.prefs.file="%EXEDIR%\prefs.properties"
+-Dnet.filebot.util.prefs.file="%EXEDIR%\data\prefs.properties"
diff --git a/installer/portable/filebot.cmd b/installer/portable/filebot.cmd
index 78c6ee18..fac50215 100644
--- a/installer/portable/filebot.cmd
+++ b/installer/portable/filebot.cmd
@@ -1,2 +1,2 @@
 @ECHO OFF
-java -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Djna.nosys=true -Dapplication.deployment=portable "-Dapplication.dir=%~dp0." "-Duser.home=%~dp0."  "-Djava.io.tmpdir=%~dp0temp" "-Djna.library.path=%~dp0" "-Djava.library.path=%~dp0" "-Dnet.filebot.AcoustID.fpcalc=%~dp0fpcalc.exe" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory "-Dnet.filebot.util.prefs.file=%~dp0prefs.properties" -jar "%~dp0FileBot.jar" %*
+java -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=portable -Djna.nosys=true -Djna.nounpack=true -Dapplication.dir="%~dp0data" -Duser.home="%~dp0data" -Djava.io.tmpdir="%~dp0data\tmp" -Djna.library.path="%~dp0." -Djna.boot.library.path="%~dp0." -Djava.library.path="%~dp0." -Dnet.filebot.AcoustID.fpcalc="%~dp0fpcalc.exe" -Djava.util.prefs.PreferencesFactory=net.filebot.util.prefs.FilePreferencesFactory -Dnet.filebot.util.prefs.file="%~dp0data\prefs.properties" -jar "%~dp0FileBot.jar" %*