From 690f62b3bade95803f48e46d83e375e6d5d8d499 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Sat, 10 Sep 2011 15:50:49 +0000
Subject: [PATCH] Update i2prouter.bat

This is based on WRAPPERSRC/src/bin/StartApp-NT.bat.in from 3.5.9 of the
wrapper. The i2prouter.bat that we ship doesn't work; this one does. Tested in
XP and Win7.
---
 installer/resources/i2prouter.bat | 85 +++++++++++++++++++++++++++++--
 1 file changed, 81 insertions(+), 4 deletions(-)

diff --git a/installer/resources/i2prouter.bat b/installer/resources/i2prouter.bat
index 66b5b4730..a938a6ce3 100644
--- a/installer/resources/i2prouter.bat
+++ b/installer/resources/i2prouter.bat
@@ -1,15 +1,92 @@
 @echo off
 setlocal
-set INSTALL_PATH="%1"
+
+rem Copyright (c) 1999, 2011 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper general startup script.
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.9 of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=i2psvc
+
+rem The name and location of the Wrapper configuration file.   This will be used
+rem  if the user does not specify a configuration file as the first argument to
+rem  this script.
+set _WRAPPER_CONF_DEFAULT=./wrapper.config
+
+rem Note that it is only possible to pass parameters through to the JVM when
+rem  installing the service, or when running in a console.
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
 
 rem
-rem Java Service Wrapper general startup script
+rem Resolve the real path of the wrapper.exe
+rem  For non NT systems, the _REALPATH and _WRAPPER_CONF values
+rem  can be hard-coded below and the following test removed.
 rem
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
 
-set _WRAPPER_EXE=%INSTALL_PATH%I2Psvc.exe
-set _WRAPPER_CONF="%INSTALL_PATH%wrapper.config"
+:nt
+rem
+rem Find the application home.
+rem
+rem %~dp0 is location of current script under NT
+set _REALPATH=%~dp0
 
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-32.exe
+goto search
+:amd64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-x86-64.exe
+goto search
+:ia64
+set _WRAPPER_L_EXE=%_REALPATH%%_WRAPPER_BASE%-windows-ia-64.exe
+goto search
+:search
+set _WRAPPER_EXE=%_WRAPPER_L_EXE%
+if exist "%_WRAPPER_EXE%" goto conf
+set _WRAPPER_EXE=%_REALPATH%%_WRAPPER_BASE%.exe
+if exist "%_WRAPPER_EXE%" goto conf
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+rem
+rem Find the wrapper.conf
+rem
+:conf
+set _WRAPPER_CONF="%~f1"
+if not [%_WRAPPER_CONF%]==[""] (
+    shift
+    goto :startup
+)
+set _WRAPPER_CONF="%_WRAPPER_CONF_DEFAULT%"
+
+rem
+rem Start the Wrapper
+rem
+:startup
 "%_WRAPPER_EXE%" -c %_WRAPPER_CONF%
 if not errorlevel 1 goto :eof
 pause
 
+:eof