From 0c7e4a9fd6085d108b74ea6de6ae941f0d83b1c4 Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Thu, 1 Aug 2024 17:03:11 -0400
Subject: [PATCH] Remove redundant functions

---
 buildscripts/release-download.sh        |  4 ++--
 docs/RELEASE.md                         |  9 ++++-----
 java/net/i2p/router/I2PAppUtil.java     | 24 ------------------------
 java/net/i2p/router/WindowsAppUtil.java |  2 +-
 4 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/buildscripts/release-download.sh b/buildscripts/release-download.sh
index a79ef02..00b4a1b 100755
--- a/buildscripts/release-download.sh
+++ b/buildscripts/release-download.sh
@@ -29,8 +29,8 @@ fi
 
 
 
-echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
-github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "i2p-firefox-$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "i2p-firefox-$I2P_VERSION"
 
 echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
 github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
index 407a48f..df72113 100644
--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -1,6 +1,5 @@
-# I2P Easy-Install Nightly Build
+# I2P Easy-Install 2.6.0
 
-This is a pre-release of the I2P Easy-Install Bundle for Windows.
-It is built from the `master` branch of the `i2p.i2p` and `i2p.firefox` repositories.
-It is a nightly build and may contain bugs.
-Use it at your own risk.
+This release of the I2P Easy-Install bundle updates the embedded I2P router to I2P 2.6.0.
+It also includes an updated I2P Firefox Profile, an updated version of I2P in Private Browsing, and updated browser plugins.
+Discovery of browser configuration has been improved on some platforms.
diff --git a/java/net/i2p/router/I2PAppUtil.java b/java/net/i2p/router/I2PAppUtil.java
index 0ba2841..38070aa 100644
--- a/java/net/i2p/router/I2PAppUtil.java
+++ b/java/net/i2p/router/I2PAppUtil.java
@@ -81,28 +81,4 @@ public class I2PAppUtil extends WindowsAppUtil {
     return true;
   }
 
-  /**
-   * get the path to the binary of the app-image root by getting the path to
-   * java.home and the OS, and traversing up to the app-image root based on that
-   * information, then getting the binary path on a per-platform basis. The path
-   * returned will be relative to the root.
-   *
-   * @return the app-image root
-   */
-  protected String appImageExe() {
-    File aih = appImageHome();
-    if (aih != null) {
-      // get the name of the aih directory itself, which will be the default
-      // name of the executable as well
-      String baseName = "I2P";
-      switch (osName()) {
-      case "windows":
-        return baseName + ".exe";
-      case "mac":
-      case "linux":
-        return "./bin/" + baseName;
-      }
-    }
-    return null;
-  }
 }
diff --git a/java/net/i2p/router/WindowsAppUtil.java b/java/net/i2p/router/WindowsAppUtil.java
index b484ec0..3a620cd 100644
--- a/java/net/i2p/router/WindowsAppUtil.java
+++ b/java/net/i2p/router/WindowsAppUtil.java
@@ -84,7 +84,7 @@ public class WindowsAppUtil extends WindowsServiceUtil {
    * information, then getting the binary path on a per-platform basis. The path
    * returned will be relative to the root.
    *
-   * @return the app-image root
+   * @return the app-image root + the path to the executable
    */
   protected String appImageExe() {
     File aih = appImageHome();