From 9331b229fe265cb0f544c467bfa56dd1e2ee3465 Mon Sep 17 00:00:00 2001 From: kytv <kytv@mail.i2p> Date: Wed, 10 Oct 2012 23:32:04 +0000 Subject: [PATCH] addressing a few concerns from #681 --- installer/resources/fixpaths.cmd | 3 +++ installer/resources/wrapper.config | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/installer/resources/fixpaths.cmd b/installer/resources/fixpaths.cmd index 72acd9756c..d8bc5850ac 100644 --- a/installer/resources/fixpaths.cmd +++ b/installer/resources/fixpaths.cmd @@ -30,6 +30,9 @@ findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.tmp1 findstr /V /R "^wrapper.java.pidfile=" wrapper.tmp1 > wrapper.tmp2 findstr /V /R "^wrapper.pidfile=" wrapper.tmp2 > wrapper.new del /F /Q wrapper.tmp* +echo #PORTABLE installation: >> wrapper.new +echo # The remaining lines should be commented out (or removed) >> wrapper.new +echo # for PORTABLE I2P installations: >> wrapper.new echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new echo wrapper.java.pidfile=%%temp%%\routerjvm.pid >> wrapper.new echo wrapper.pidfile=%%temp%%\i2p.pid >> wrapper.new diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config index 07c837b930..cfc59182f1 100644 --- a/installer/resources/wrapper.config +++ b/installer/resources/wrapper.config @@ -33,8 +33,15 @@ wrapper.java.command=java #wrapper.java.command=%JAVA_HOME%/bin/java # Gentoo uses the following: #wrapper.java.command=/etc/java-config-2/current-system-vm/bin/java +# # Tell the Wrapper to log the full generated Java command line. #wrapper.java.command.loglevel=INFO +## +## PORTABLE installation: +# A portable Java installation can be configured thusly: +#set.JAVA_HOME=C:\path\to\your\portable\java\installation +#wrapper.java.command=%JAVA_HOME\bin\java.exe +## # Java Main class. This class must implement the WrapperListener interface # or guarantee that the WrapperManager class is initialized. Helper -- GitLab