From addf62d6404c02f7c36f61c27b7cd9d1cbbdb3f5 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Mon, 8 Aug 2022 20:10:10 -0400
Subject: [PATCH] update launcher script to self-discover jar. add some build
 targets of convenience

Former-commit-id: fb30909e3aba91deb3b1a60a4beb8658d7bfb2a4
Former-commit-id: 07f93beb2e49f297bd59f9f45c3da72daced4362
---
 CHANGES.md     |  1 +
 build.xml      | 20 +++++++++++++++++++-
 i2pbrowser.cmd |  4 ++--
 release.sh     |  9 +++------
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 945d6f8..ef04666 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@ Mon, August 8
 -------------
 
  - Add Chromium support. You heard me. Chromium support.
+ - Update launcher script so it self-discovers the location of the script and uses that to find the bundled jar.
 
 Sun, August 7
 -------------
diff --git a/build.xml b/build.xml
index b72e345..f30b1a9 100755
--- a/build.xml
+++ b/build.xml
@@ -8,6 +8,10 @@
         <ant dir="src" target="build" />
     </target>
 
+    <target name="jar" >
+        <ant dir="src" target="jar" />
+    </target>
+
     <target name="i2pFirefoxBaseProfileZip">
         <exec executable="rm" failonerror="false" dir="src">
             <arg value="-rf" />
@@ -32,6 +36,20 @@
         </exec>
     </target>
 
+    <target name="freeZip" depends="jar">
+        <exec executable="rm" failonerror="false" dir="src">
+            <arg value="-rf" />
+            <arg value="i2pbrowser.zip" />
+        </exec>
+        <exec executable="zip" failonerror="true">
+            <arg value="-r"/>
+            <arg value="src/build/i2pfirefox.jar"/>
+            <arg value="i2pbrowser.cmd"/>
+            <arg value="LICENSE.md"/>
+            <arg value="README.md"/>
+        </exec>
+    </target>
+
     <target name="plugin" depends="war">
         <delete>
            <!-- in installer but not update -->
@@ -40,7 +58,7 @@
         <delete dir="plugin/eepsite/docroot/torrents/" />
         <!-- get version number -->
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="0.0.5" />
+        <property name="release.number" value="0.0.6" />
 
         <!-- make the update xpi2p -->
         <!-- this contains everything except i2ptunnel.config -->
diff --git a/i2pbrowser.cmd b/i2pbrowser.cmd
index b4ceeaa..92bf2ab 100755
--- a/i2pbrowser.cmd
+++ b/i2pbrowser.cmd
@@ -1,3 +1,3 @@
-:; java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PFirefox; exit $?
+:; dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd); java -cp "$dir"/src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PFirefox; exit $?
 @ECHO OFF
-java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PFirefox
\ No newline at end of file
+java -cp %cd%/src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PFirefox
\ No newline at end of file
diff --git a/release.sh b/release.sh
index 283c44f..536863a 100755
--- a/release.sh
+++ b/release.sh
@@ -4,10 +4,9 @@ GITHUB_USER=eyedeekay
 GITHUB_REPO=i2p.plugins.firefox
 GITHUB_NAME="Initial Release"
 GITHUB_DESCRIPTION=$(cat CHANGES.md)
-GITHUB_TAG=0.0.5
+GITHUB_TAG=0.0.6
 ant distclean
-cd src && \
-    ant
+ant jar freeZip
 github-release release --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \
     --name "${GITHUB_NAME}" \
@@ -18,10 +17,8 @@ github-release upload --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --name "i2pfirefox.jar" \
-    --file "build/i2pfirefox.jar" \
+    --file "src/build/i2pfirefox.jar" \
     --replace
-cd ../
-zip -r i2pfirefox.zip src/build/i2pfirefox.jar i2pbrowser.cmd LICENSE.md README.md
 github-release upload --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \