From 7f96e279d718908e90b41db44c438708c4a6326c Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Thu, 9 Jun 2011 18:04:51 +0000
Subject: [PATCH] Since postinstall.bat isn't used any longer: - removing from
 /build.xml - moving recent changes from installer/resources/postinstall.bat
 to installer/install.xml - dropping installer/resources/postinstall.bat

---
 build.xml                           |  1 -
 installer/install.xml               |  2 +-
 installer/resources/postinstall.bat | 55 -----------------------------
 3 files changed, 1 insertion(+), 57 deletions(-)
 delete mode 100644 installer/resources/postinstall.bat

diff --git a/build.xml b/build.xml
index 6cc35fe09..592583f7e 100644
--- a/build.xml
+++ b/build.xml
@@ -501,7 +501,6 @@
         <copy file="installer/resources/i2prouter.bat" todir="pkg-temp/" />
         <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
         <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
-        <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
         <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
         <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
         <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
diff --git a/installer/install.xml b/installer/install.xml
index 4c0e9057e..0628a4f6e 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -136,7 +136,7 @@
             <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
-                <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.jar" /><arg value="$INSTALL_PATH\lib" /></args></executable>
+                <args><arg value="$INSTALL_PATH\lib\wrapper\all\wrapper.jar" /><arg value="$INSTALL_PATH\lib" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH\i2prouter" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
diff --git a/installer/resources/postinstall.bat b/installer/resources/postinstall.bat
deleted file mode 100644
index f25a143ef..000000000
--- a/installer/resources/postinstall.bat
+++ /dev/null
@@ -1,55 +0,0 @@
-:: I2P Installer - Installs and pre-configures I2P.
-::
-:: postinstall.bat
-:: 2004 The I2P Project
-:: http://www.i2p2.de/
-:: This code is public domain.
-::
-:: author: hypercubus
-::
-:: Installs the Java Service Wrapper support files for Win32 then launches the
-:: I2P router as a background service.
-
-@echo off
-setlocal
-
-if "%OS%"=="Windows_NT" (
-set INSTALL_PATH=%~dp0
-) else (
-set INSTALL_PATH="%1"
-)
-
-copy "%INSTALL_PATH%lib\wrapper\win32\I2Psvc.exe" "%INSTALL_PATH%"
-copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.dll" "%INSTALL_PATH%lib"
-copy "%INSTALL_PATH%lib\wrapper\all\wrapper.jar" "%INSTALL_PATH%lib"
-
-if "%OS%"=="Windows_NT" (
-
-del /f /q "%INSTALL_PATH%i2prouter"
-:: del /f /q "%INSTALL_PATH%install_i2p_service_unix"
-del /f /q "%INSTALL_PATH%install-headless.txt"
-del /f /q "%INSTALL_PATH%osid"
-del /f /q "%INSTALL_PATH%postinstall.sh"
-del /f /q "%INSTALL_PATH%startRouter.sh"
-:: del /f /q "%INSTALL_PATH%uninstall_i2p_service_unix"
-del /f /q "%INSTALL_PATH%icons\*.xpm"
-rmdir /q /s "%INSTALL_PATH%lib\wrapper"
-start /b /i /d"%INSTALL_PATH%" i2prouter.bat %INSTALL_PATH%
-
-) else (
-
-del "%INSTALL_PATH%eepget"
-del "%INSTALL_PATH%i2prouter"
-:: del "%INSTALL_PATH%install_i2p_service_unix"
-del "%INSTALL_PATH%install_i2p_service_winnt.bat"
-del "%INSTALL_PATH%install-headless.txt"
-del "%INSTALL_PATH%osid"
-del "%INSTALL_PATH%postinstall.sh"
-del "%INSTALL_PATH%startRouter.sh"
-:: del "%INSTALL_PATH%uninstall_i2p_service_unix"
-del "%INSTALL_PATH%uninstall_i2p_service_winnt.bat"
-del "%INSTALL_PATH%icons\*.xpm"
-deltree /Y "%INSTALL_PATH%lib\wrapper"
-start /M "%INSTALL_PATH%i2prouter.bat" %INSTALL_PATH%
-
-)