make the i2pversion script output the version that we're actually building

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"

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.

i2pversion

@@ -31,5 +31,8 @@ export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 VERSION="i2p-$GITHUB_TAG"
 export VERSION="i2p-$GITHUB_TAG"
 
-I2PFIREFOX_VERSION=$I2P_VERSION
-export I2PFIREFOX_VERSION=$I2P_VERSION
+I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.2"
+export I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.2"
+echo "I2P version $I2P_VERSION"
+echo "Tag $VERSION"
+echo "I2P Firefox Profile version $I2PFIREFOX_VERSION"

java/net/i2p/router/I2PAppUtil.java

@@ -80,29 +80,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;
-  }
 }

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();