fix path for default plugin install

use i2p.plugins.firefox as a plugin instead of as a library
2024-03-08 14:54:39 -05:00 · 2024-03-08 11:58:49 -05:00 · 2024-03-07 22:31:18 -05:00 · 2024-03-07 22:18:41 -05:00 · 2024-03-07 21:21:01 -05:00
3 changed files with 16 additions and 5 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
          workflow: ant.yml
          if_no_artifact_found: fail
      # remove .zip file extension
-      - run: for f in *.zip; do mv "$f" "${f%.zip}"; done
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
      - run: echo "" | tee -a changelog.txt
      - run: echo "## Checksums" | tee -a changelog.txt
      - run: echo "" | tee -a changelog.txt
@@ -68,6 +68,10 @@ jobs:
      - run: sha256sum * | tee -a changelog.txt
      - run: echo '```' | tee -a changelog.txt
      - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: file * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
      - name: Upload artifacts
        uses: ncipollo/release-action@v1
        with:
--- a/buildscripts/launcher.sh
+++ b/buildscripts/launcher.sh
@@ -104,9 +104,16 @@ if [ ! -f "$SCRIPT_DIR/build/jna-platform.jar" ]; then
  wget_download "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna-platform.jar"
 fi

-if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.jar" ]; then
+if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.zip" ]; then
  echo "downloading i2pfirefox jars"
-  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar" -O "$SCRIPT_DIR/build/i2pfirefox.jar"
+  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/plugin.zip" -O "$SCRIPT_DIR/build/i2pfirefox.zip"
+fi
+
+if [ ! -d "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox" ]; then
+  mkdir -p "$SCRIPT_DIR/build/I2P/config/plugins/"
+  unzip "$SCRIPT_DIR/build/i2pfirefox.zip" -d "$SCRIPT_DIR/build/I2P/config/plugins/plugin"
+  rm -rf "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
+  mv "$SCRIPT_DIR/build/I2P/config/plugins/plugin" "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
 fi

 for dll in "$I2P_JBIGI/"*windows*.dll; do
--- a/4
+++ b/4
@@ -2,8 +2,8 @@

 JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
-I2PFIREFOX_VERSION=1.0.9
-export I2PFIREFOX_VERSION=1.0.9
+I2PFIREFOX_VERSION=1.4.7
+export I2PFIREFOX_VERSION=1.4.7
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=2
Author	SHA1	Message	Date
eyedeekay	1e959d0aa1	fix path for default plugin install	2024-03-08 14:54:39 -05:00
eyedeekay	8f6e7bc83c	use i2p.plugins.firefox as a plugin instead of as a library	2024-03-08 11:58:49 -05:00
eyedeekay	fc84098dc9	use i2p.plugins.firefox as a plugin instead of as a library	2024-03-07 22:31:18 -05:00
eyedeekay	52a33b5334	zip during run phase	2024-03-07 22:18:41 -05:00
eyedeekay	e055eb8aa9	don't skip unpacking	2024-03-07 21:21:01 -05:00