From d8eb1a0a4f89cdc74f6e2a0f228060b9f766bd8c Mon Sep 17 00:00:00 2001
From: hypercubus <hypercubus>
Date: Thu, 26 Aug 2004 19:08:25 +0000
Subject: [PATCH] more path woes solved, scripts launch properly from installer
 (yay!)

---
 build.xml                                 |  2 +-
 installer/resources/ProcessPanel.Spec.xml |  4 ++--
 installer/resources/postinstall.sh        | 14 +++++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index bff0114a84..39c2ee63a9 100644
--- a/build.xml
+++ b/build.xml
@@ -225,8 +225,8 @@
         <copy file="installer/resources/install_i2p_service_unix" todir="pkg-temp/" />
         <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
         <copy file="installer/resources/osid" todir="pkg-temp/" />
-        <copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
         <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
+        <copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
         <copy file="installer/resources/systray.config" todir="pkg-temp/" />
         <copy file="installer/resources/uninstall_i2p_service_unix" todir="pkg-temp/" />
         <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
diff --git a/installer/resources/ProcessPanel.Spec.xml b/installer/resources/ProcessPanel.Spec.xml
index b632c33a75..edea06fda3 100644
--- a/installer/resources/ProcessPanel.Spec.xml
+++ b/installer/resources/ProcessPanel.Spec.xml
@@ -7,8 +7,8 @@
     </job>
     <job name="Launching I2P...">
         <os family="unix" />
-        <executefile name="$INSTALL_PATH/sh">
-            <arg>postinstall.sh</arg>
+        <executefile name="/bin/sh">
+            <arg>$INSTALL_PATH/postinstall.sh</arg><arg>$INSTALL_PATH</arg>
         </executefile>
     </job>
 </processing>
\ No newline at end of file
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index 4a6fb5b3bc..e0ebc23f23 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -12,11 +12,14 @@
 # Installs the appropriate set of Java Service Wrapper support files for the
 # user's OS then launches the I2P router as a background service.
 
-chmod 744 i2prouter
-chmod 744 i2psvc
-chmod 744 install_i2p_service_unix
-chmod 744 osid
-chmod 744 uninstall_i2p_service_unix
+if [ $1 ]; then
+    cd $1
+fi
+
+chmod 744 ./i2prouter
+chmod 744 ./install_i2p_service_unix
+chmod 744 ./osid
+chmod 744 ./uninstall_i2p_service_unix
 
 ERROR_MSG="Cannot determine operating system type. From the subdirectory in lib/wrapper matching your operating system, please move i2psvc to your base I2P directory, and move the remaining two files to the lib directory."
 HOST_OS=`./osid`
@@ -46,6 +49,7 @@ case $HOST_OS in
 esac
 
 cp $wrapperpath/i2psvc .
+chmod 744 ./i2psvc
 cp $wrapperpath/* ./lib/
 ./i2prouter start
 exit 0