be even more specific about the WinLauncher.java URL fixes

.gitignore

@@ -20,4 +20,5 @@ cmd
 *.so
 *.jar
 *.zip
-*.tar.gz
+*.tar.gz
+config_override.sh

Makefile

@@ -60,7 +60,6 @@ export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"
 
 distclean: clean
 	rm -rf I2P
-	git clean -fd
 
 I2P:
 	./build.sh
@@ -73,7 +72,6 @@ build/I2P: I2P build
 src/I2P/config:
 	mkdir -p src/I2P/config
 	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
-	echo true | tee src/I2P/config/jpackaged
 	cp -v $(RES_DIR)/clients.config src/I2P/config/
 	cp -v $(RES_DIR)/wrapper.config src/I2P/config/
 	#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config

build.sh

@@ -38,6 +38,9 @@ make src/I2P/config
   $JPACKAGE_OPTS \
   --resource-dir build \
   --app-content src/I2P/config \
+  --app-content src/icons/windowsUIToopie2.png \
+  --app-content src/icons/ui2pbrowser_icon.ico \
+  --icon src/icons/windowsUIToopie2.png \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
 
 cp "$I2P_PKG/licenses/"* license/

changelog.txt

@@ -1,3 +1,7 @@
+2022-09-20 idk
+ * improve compatibility with local service installs and with un-bundled installs side-by-side with bundled intalls
+ * version 1.9.7
+
 2022-09-18 idk
  * remove unstable/deprecated targets from Makefile.
  * make it fatal if a jpackaged I2P is not found, the profile launcher is now part of the jpackage

daily-linux.sh

@@ -36,12 +36,12 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="==================================================="
+===================================================
-  DESCRIPTION+=""
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs."
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk."
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+=""
+"
 fi
 
 echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

daily-unstable.sh

@@ -11,11 +11,8 @@ if [ -f i2pversion_override ]; then
     . "$SCRIPT_DIR/i2pversion_override"
 fi
 
-. "$SCRIPT_DIR/config.sh"
+. "$SCRIPT_DIR/config_override.sh"
 
-if [ -f config_overide.sh ]; then
-  . "$SCRIPT_DIR/config_override.sh"
-fi
 
 ### How to set up this script:
 #
@@ -27,6 +24,7 @@ fi
 # GITHUB_USERNAME=your github username
 git clean -fd
 git checkout .
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
 ./unsigned.sh
 
 . "$HOME/github-release-config.sh"
@@ -38,12 +36,12 @@ fi
 TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="==================================================="
+===================================================
-  DESCRIPTION+=""
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs."
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk."
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+=""
+"
 fi
 
 echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

daily.sh

@@ -9,12 +9,9 @@ if [ -f i2pversion_override ]; then
     . "$SCRIPT_DIR/i2pversion_override"
 fi
 
+mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
-  . "$SCRIPT_DIR/config_override.sh"
-fi
-
 ### How to set up this script:
 #
 # This script will not work unless you give it a Github API key.
@@ -36,12 +33,12 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
-  DESCRIPTION+="==================================================="
+===================================================
-  DESCRIPTION+=""
+
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs."
+These builds are automatically built on a daily basis and may have serious bugs.
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk."
+They are intended for testing purposes only, use them at your own risk.
-  DESCRIPTION+=""
+"
 fi
 
 echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

edit-release-unstable.sh

@@ -0,0 +1,38 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

edit-release.sh

@@ -0,0 +1,36 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE=$(date +%Y%m%d)
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

exe.sh

@@ -17,6 +17,8 @@ jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
     --app-content src/I2P/config \
+    --app-content src/icons/windowsUIToopie2.png \
+    --icon src/icons/windowsUIToopie2.png \
     --input build \
     --verbose \
     --type exe \

experimental.sh

@@ -5,7 +5,7 @@ cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 

i2pversion

@@ -2,13 +2,13 @@
 
 JNA_VERSION=5.11.0
 export JNA_VERSION=5.11.0
-I2PFIREFOX_VERSION=0.0.34
+I2PFIREFOX_VERSION=0.0.36
 export I2PFIREFOX_VERSION=0.0.36
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=1
 VERSIONMINOR=9
-VERSIONBUILD=6
+VERSIONBUILD=7
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 VERSION=i2p-jpackage-1.9.4

java/net/i2p/router/CopyConfigDir.java

@@ -12,7 +12,7 @@ import java.util.logging.FileHandler;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
-public class CopyConfigDir {
+public class CopyConfigDir extends WindowsServiceUtil {
   static final Logger logger = Logger.getLogger("configlog");
 
   public static void initLogger() {
@@ -46,7 +46,7 @@ public class CopyConfigDir {
         if (copyDirectory(file, new File(newPath)))
           return false;
       if (file.isFile())
-        if (!copyFile(file, new File(newPath), true))
+        if (0 == copyFile(file, new File(newPath), true))
           return false;
     }
     return true;
@@ -61,37 +61,49 @@ public class CopyConfigDir {
       if (file.isDirectory())
         if (!copyConfigDirectory(file, new File(newPath)))
           return false;
-      if (file.isFile())
+      if (file.isFile()) {
-        if (!copyFileNeverOverwrite(
+        int cnr = copyFileNeverOverwrite(file, new File(newPath));
-                file,
+        if (0 == cnr)
-                new File(newPath))) // new File(workDir, file.toString())))
           return false;
+        if (1 == cnr) {
+          logger.info("using jpackaged configs in a jpackaged install, creating jpackaged file");
+          File jpackagedConfigsInUse = new File(appImageHome(), "jpackaged");
+          if (!jpackagedConfigsInUse.exists()){
+            try{
+              jpackagedConfigsInUse.createNewFile();
+            }catch(IOException e){
+              logger.warning("Error creating jpackaged file, delete config files manually when uninstalling");
+            }
+          }
+        }
+        if (-1 == cnr) {
+          logger.info("not overwriting existing config file, not creating jpackaged file");
+        }
+      }
     }
     return true;
   }
 
-  public static boolean copyFileNeverOverwrite(String basePath,
+  public static int copyFileNeverOverwrite(String basePath, String workPath) {
-                                               String workPath) {
     File baseFile = new File(basePath);
     File workFile = new File(workPath);
     return copyFileNeverOverwrite(baseFile, workFile);
   }
 
-  public static boolean copyFileNeverOverwrite(File basePath, File workPath) {
+  public static int copyFileNeverOverwrite(File basePath, File workPath) {
     return copyFile(basePath, workPath, false);
   }
 
-  public static boolean copyFile(File basePath, File workPath,
+  public static int copyFile(File basePath, File workPath, boolean overWrite) {
-                                 boolean overWrite) {
     if (!basePath.exists()) {
       logger.info(basePath.getAbsolutePath() + " doesn't exist, not copying");
-      return false;
+      return 0;
     }
 
     if (!overWrite && workPath.exists()) {
       logger.info(workPath.getAbsolutePath() +
                   " already exists, not overwriting");
-      return true;
+      return -1;
     }
 
     File workDir = workPath.getParentFile();
@@ -111,12 +123,12 @@ public class CopyConfigDir {
       }
       in.close();
       out.close();
-      return true;
+      return 1;
     } catch (Throwable e) {
       logger.warning(e.toString());
       logger.warning("failed to copy " + basePath.getAbsolutePath() + " to " +
                      workPath.getAbsolutePath());
-      return false;
+      return 0;
     }
   }
 
@@ -152,20 +164,6 @@ public class CopyConfigDir {
     return i2p;
   }
 
-  /**
-   * get the OS name(windows, mac, linux only)
-   *
-   * @return os name in lower-case, "windows" "mac" or  "linux"
-   */
-  protected static String osName() {
-    String osName = System.getProperty("os.name").toLowerCase();
-    if (osName.contains("windows"))
-      return "windows";
-    if (osName.contains("mac"))
-      return "mac";
-    return "linux";
-  }
-
   /**
    * get the path to the java home, for jpackage this is related to the
    * executable itself, which is handy to know. It's a directory called runtime,

java/net/i2p/router/WinLauncher.java

@@ -33,7 +33,7 @@ public class WinLauncher extends CopyConfigDir {
   static WindowsUpdatePostProcessor wupp = null;
   private static Router i2pRouter;
 
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
     setupLauncher();
     initLogger();
     boolean privateBrowsing = false;
@@ -88,13 +88,6 @@ public class WinLauncher extends CopyConfigDir {
     File programs = programFile();
     File home = homeDir();
 
-    // This actually does most of what we use NSIS for if NSIS hasn't
-    // already done it, which essentially makes this whole thing portable.
-    if (!copyConfigDir()) {
-      logger.severe("Cannot copy the configuration directory");
-      System.exit(1);
-    }
-
     System.setProperty("i2p.dir.base", programs.getAbsolutePath());
     System.setProperty("i2p.dir.config", home.getAbsolutePath());
     System.setProperty("router.pid",
@@ -110,17 +103,42 @@ public class WinLauncher extends CopyConfigDir {
     logger.info("\t" + System.getProperty("i2p.dir.base"));
     logger.info("\t" + System.getProperty("i2p.dir.config"));
     logger.info("\t" + System.getProperty("router.pid"));
+    boolean continuerunning = promptServiceStartIfAvailable("i2p");
+    if (!continuerunning) {
+      logger.severe(
+          "Service startup failure, please start I2P service with services.msc");
+      System.exit(2);
+    } else {
+      fixServiceConfig();
+    }
+    continuerunning = promptUserInstallStartIfAvailable();
+    if (!continuerunning) {
+      logger.severe("User-install startup required.");
+      System.exit(2);
+    } else {
+      fixServiceConfig();
+    }
+
+    // This actually does most of what we use NSIS for if NSIS hasn't
+    // already done it, which essentially makes this whole thing portable.
+    if (!copyConfigDir()) {
+      logger.severe("Cannot copy the configuration directory");
+      System.exit(1);
+    }
+
     if (launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
                       proxyTimeoutTime, newArgsList)) {
       System.exit(0);
     }
     i2pRouter = new Router(routerConfig(), System.getProperties());
-    if (i2pRouter.saveConfig("routerconsole.browser", null)) {
+    if (!isInstalled("i2p")) {
-      logger.info("removed routerconsole.browser config");
+      if (i2pRouter.saveConfig("routerconsole.browser", null)) {
-    }
+        logger.info("removed routerconsole.browser config");
-    if (i2pRouter.saveConfig("routerconsole.browser",
+      }
-                             appImageExe() + " -noproxycheck")) {
+      if (i2pRouter.saveConfig("routerconsole.browser",
-      logger.info("updated routerconsole.browser config " + appImageExe());
+                               appImageExe() + " -noproxycheck")) {
+        logger.info("updated routerconsole.browser config " + appImageExe());
+      }
     }
     logger.info("Router is configured");
 
@@ -134,6 +152,62 @@ public class WinLauncher extends CopyConfigDir {
     i2pRouter.runRouter();
   }
 
+  private static void fixServiceConfig() {
+    if (osName() != "windows")
+      return;
+    // If the user installed the Easy bundle before installing the
+    // IzPack installer, then they have a config file which contains the
+    // wrong update URL. Check for it, and change it back if necessary.
+    // closes #23
+    String routerconf = routerConfig();
+    if (routerconf != null) {
+      File routerconffile = new File(routerconf);
+      if (!routerconffile.exists()) {
+        return;
+      }
+    } else {
+      return;
+    }
+    if (isInstalled("i2p") || checkProgramFilesInstall()) {
+      i2pRouter = new Router(routerconf, System.getProperties());
+      String newsURL = i2pRouter.getConfigSetting("router.newsURL");
+      if (newsURL != null) {
+        if (newsURL.contains("http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3")) {
+          logger.info(
+              "checked router.newsURL config, containes win/beta in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.newsURL", ServiceUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+      String backupNewsURL = i2pRouter.getConfigSetting("router.backupNewsURL");
+      if (backupNewsURL != null) {
+        if (backupNewsURL.contains("http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3")) {
+          logger.info(
+              "checked router.backupNewsURL config, containes win/beta in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.backupNewsURL",
+                                   ServiceBackupUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+      String updateURL = i2pRouter.getConfigSetting("router.updateURL");
+      if (updateURL != null) {
+        if (updateURL.contains("http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3")) {
+          logger.info(
+              "checked router.updateURL config, containes easy-intall update in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.updateURL",
+                                   ServiceStaticUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+    }
+  }
+
   private static void setupLauncher() {
     File jrehome = javaHome();
     logger.info("jre home is: " + jrehome.getAbsolutePath());

java/net/i2p/router/WindowsServiceUtil.java

@@ -1,6 +1,7 @@
 package net.i2p.router;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import javax.swing.JOptionPane;
@@ -105,31 +106,124 @@ public class WindowsServiceUtil {
     return false;
   }
 
-  public static void promptServiceStartIfAvailable(String serviceName) {
+  public static boolean promptServiceStartIfAvailable(String serviceName) {
+    if (osName() != "windows") {
+      return true;
+    }
     if (isInstalled(serviceName)) {
       if (!isStart(serviceName)) {
         int a;
         String message =
             "It appears you have an existing I2P service installed.\n";
         message +=
-            "However, it is not running yet. Would you like to start it?\n";
+            "However, it is not running yet. Please start it through `services.msc`.\n";
+        message +=
+            "If you click \"No\", the jpackage router will be launched instead.\n";
         a = JOptionPane.showConfirmDialog(null, message,
                                           "I2P Service detected not running",
                                           JOptionPane.YES_NO_OPTION);
         if (a == JOptionPane.NO_OPTION) {
           // Do nothing here, this will continue on to launch a jpackaged router
+          return true;
         } else {
           // We can't just call `net start` or `sc start` directly, that throws
           // a permission error. We can start services.msc though, where the
           // user can start the service themselves. OR maybe we ask for
           // elevation here? May need to refactor Elevator and Shell32X to
           // achieve it though
+          ProcessBuilder pb =
+              new ProcessBuilder("C:\\Windows\\System32\\services.msc");
+          try {
+            Process p = pb.start();
+            int exitCode = p.waitFor();
+            if (exitCode != 0) {
+              return false;
+            }
+          } catch (IOException e) {
+            return false;
+          } catch (InterruptedException e) {
+            return false;
+          }
         }
+        return isStart("i2p");
+      }
+      return true;
+    }
+    return true;
+  }
+
+  public static String ServiceUpdaterString() {
+    return "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
+  }
+  public static String ServiceBackupUpdaterString() {
+    return "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news.su3";
+  }
+  public static String ServiceStaticUpdaterString() {
+    return "http://echelon.i2p/i2p/i2pupdate.sud,http://stats.i2p/i2p/i2pupdate.sud";
+  }
+
+  public static String getProgramFilesInstall() {
+    String programFiles = System.getenv("PROGRAMFILES");
+    if (programFiles != null) {
+      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
+      if (programFilesI2P.exists())
+        return programFilesI2P.getAbsolutePath();
+    }
+    String programFiles86 = System.getenv("PROGRAMFILES86");
+    if (programFiles86 != null) {
+      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
+      if (programFiles86I2P.exists())
+        return programFiles86I2P.getAbsolutePath();
+    }
+    return null;
+  }
+
+  public static boolean checkProgramFilesInstall() {
+    String programFiles = System.getenv("PROGRAMFILES");
+    if (programFiles != null) {
+      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
+      if (programFilesI2P.exists())
+        return true;
+    }
+    String programFiles86 = System.getenv("PROGRAMFILES86");
+    if (programFiles86 != null) {
+      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
+      if (programFiles86I2P.exists())
+        return true;
+    }
+    return false;
+  }
+
+  public static boolean promptUserInstallStartIfAvailable() {
+    if (osName() != "windows") {
+      return true;
+    }
+    if (checkProgramFilesInstall()) {
+      int a;
+      String message =
+          "It appears you have an existing, unbundled I2P rotuer installed.\n";
+      message +=
+          "However, it is not running yet. Please start it using the shortcut on the desktop.\n";
+      message +=
+          "If you click \"No\", the jpackage router will be launched instead.\n";
+      a = JOptionPane.showConfirmDialog(null, message,
+                                        "I2P Service detected not running",
+                                        JOptionPane.YES_NO_OPTION);
+      if (a == JOptionPane.NO_OPTION) {
+        // Do nothing here, this will continue on to launch a jpackaged router
+        return true;
       } else {
-        // Here, the service is already started, so I2P should appear to be
+        try {
-        // running to the other checks.
+          String pfi = getProgramFilesInstall();
+          if (pfi != null)
+            Runtime.getRuntime().exec(pfi);
+        } catch (IOException e) {
+          return false;
+        }
+        return true;
       }
     }
+    return true;
   }
 
   public static String getServiceState(String serviceName) {
@@ -160,6 +254,20 @@ public class WindowsServiceUtil {
     }
     return stateString;
   }
+
+  /**
+   * get the OS name(windows, mac, linux only)
+   *
+   * @return os name in lower-case, "windows" "mac" or  "linux"
+   */
+  protected static String osName() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    if (osName.contains("windows"))
+      return "windows";
+    if (osName.contains("mac"))
+      return "mac";
+    return "linux";
+  }
   public static void main(String args[]) {
     // when querying the I2P router service installed by the IzPack installer
     // this is the correct call.

launcher.sh

@@ -12,7 +12,7 @@ fi
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 

msi.sh

@@ -18,6 +18,8 @@ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
     --app-content src/I2P/config \
+    --app-content src/icons/windowsUIToopie2.png \
+    --icon src/icons/windowsUIToopie2.png \
     --input build \
     --verbose \
     --type msi \

release.sh

@@ -5,7 +5,7 @@ cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 

sign.sh

@@ -11,7 +11,7 @@ fi
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 

src/app-profile/version.txt

@@ -1 +1 @@
-1.9.6
+1.9.7

src/nsis/i2pbrowser-installer.nsi

@@ -4,7 +4,7 @@ UniCode true
 !define APPNAME "I2PBrowser-Launcher"
 !define COMPANYNAME "I2P"
 !define DESCRIPTION "This is a tool which contains an I2P router, a bundled JVM, and a tool for automatically configuring a browser to use with I2P."
-!define I2P_MESSAGE "Could not find I2P. Installing portable Jpackaged I2P."
+!define I2P_MESSAGE "Please choose a directory."
 !define LAUNCH_TEXT "Start I2P?"
 !define LICENSE_TITLE "Many Licenses"
 !define CONSOLE_URL "http://127.0.0.1:7657/home"
@@ -13,11 +13,11 @@ UniCode true
 !include i2pbrowser-jpackage.nsi
 !include FindProcess.nsh
 
-var I2PINSTEXE
+var INSTDIR
 
 SetOverwrite on
 
-!define I2PINSTEXE
+!define INSTDIR
 !define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2p"
 
 !define RAM_NEEDED_FOR_64BIT 0x80000000
@@ -122,18 +122,18 @@ PageEx license
 PageExEnd
 PageEx directory
     dirtext "${I2P_MESSAGE}"
-    dirvar $I2PINSTEXE
+    dirvar $INSTDIR
     PageCallbacks routerDetect
 PageExEnd
 Page instfiles
 
 Function .onInit
-    StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
+    StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
     UserInfo::GetAccountType
     pop $0
     ${If} $0 != "admin"
-        StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}"
+        StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
-        StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
+        StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
     ${EndIf}
     !insertmacro MUI_LANGDLL_DISPLAY
     #Call ShouldInstall64Bit
@@ -141,33 +141,22 @@ Function .onInit
 FunctionEnd
 
 Function routerDetect
-    createDirectory $I2PINSTEXE
+    createDirectory $INSTDIR
-    SetOutPath $I2PINSTEXE\app
+    SetOutPath $INSTDIR\app
     File /a /r "I2P\app\"
-    SetOutPath $I2PINSTEXE\runtime
+    SetOutPath $INSTDIR\runtime
     File /a /r "I2P\runtime\"
-    SetOutPath $I2PINSTEXE
+    SetOutPath $INSTDIR\config
+    File /a /r "I2P\config\"
+    SetOutPath $INSTDIR
     File /a /r "I2P\I2P.exe"
-    File /a /r "I2P\I2P.ico"
+    # The NSIS Installer uses an ico icon, the jpackage-only ones use png
-    File "I2P\config\jpackaged"
+    File /a /r "I2P\ui2pbrowser_icon.ico"
 
-    createDirectory "$I2PINSTEXE\"
+    createDirectory "$INSTDIR\"
-    SetOutPath "$I2PINSTEXE\"
+    SetOutPath "$INSTDIR\"
-    IfFileExists $I2PINSTEXE\router.config +2 0
-        File  /a /r "I2P/config/router.config"
-    IfFileExists $I2PINSTEXE\clients.config +2 0
-        File  /a /r "I2P/config/clients.config"
-    IfFileExists $I2PINSTEXE\wrapper.config +2 0
-        File  /a /r "I2P/config/wrapper.config"
-    IfFileExists $I2PINSTEXE\hosts.txt +2 0
-        File  /a /r "I2P/config/hosts.txt"
-    IfFileExists $I2PINSTEXE\eepsite +2 0
-        File  /a /r "I2P/config/eepsite"
-    IfFileExists $I2PINSTEXE\webapps +2 0
-        File  /a /r "I2P/config/webapps"
     File  /a /r "I2P/config/certificates"
     File  /a /r "I2P/config/geoip"
-    File  /a /r "I2P/config/i2ptunnel.config"
 FunctionEnd
 
 Function installerFunction
@@ -177,28 +166,19 @@ Function installerFunction
             Sleep 500
         ${LoopWhile} $0 <> 0
     ${EndIf}
+    # delete the jpackaged file for safety. Remove this IMMEDIATELY after the next release.
+    # early-adopters and daily-build users may have to manually delete config files if they
+    # uninstall.
+    # RELATED: line 246
+    Delete "$INSTDIR\jpackaged"
 
     # set the installation directory as the destination for the following actions
     createDirectory $INSTDIR
     SetOutPath $INSTDIR
     File ui2pbrowser_icon.ico
 
-    # Update jpackaged I2P router, if it exists
+    # Update jpackaged I2P router
-    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
+    call routerDetect
-        createDirectory $I2PINSTEXE
-        SetOutPath $I2PINSTEXE
-
-        ${If} ${Silent}
-          ReadEnvStr $0 OLD_I2P_VERSION
-          ${If} $0 < ${I2P_VERSION}
-            call routerDetect
-
-          ${EndIf}  
-        ${Else}
-          call routerDetect
-
-        ${EndIf}
-    ${EndIf}
 
     # Install the launcher scripts
     createDirectory "$INSTDIR"
@@ -210,35 +190,22 @@ Function installerFunction
     SetOutPath "$INSTDIR\licenses"
     File /a /r "licenses/*"
 
-    SetOutPath "$I2PINSTEXE"
+    SetOutPath "$INSTDIR"
     createDirectory "$SMPROGRAMS\${APPNAME}"
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk" "$INSTDIR\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P - Temporary Identity.lnk" "$INSTDIR\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
 
-    CreateShortCut "$DESKTOP\Browse I2P.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$DESKTOP\Browse I2P.lnk" "$INSTDIR\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "$INSTDIR\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
     SetOutPath "$INSTDIR"
 
     SetShellVarContext current
-    Var /Global I2PAPPDATA 
-
-    IfFileExists "$I2PINSTEXE\clients.config" 0 +2
-        StrCpy $I2PAPPDATA "$I2PINSTEXE"
-    IfFileExists "$APPDATA\I2P\clients.config.d" 0 +2
-        StrCpy $I2PAPPDATA "$APPDATA\I2P\"
-    IfFileExists "$LOCALAPPDATA\I2P\clients.config.d" 0 +2
-        StrCpy $I2PAPPDATA "$LOCALAPPDATA\I2P\"
-    IfFileExists "$LOCALAPPDATA\I2P\clients.config" 0 +2
-        StrCpy $I2PAPPDATA "$LOCALAPPDATA\I2P\"
-
-    createDirectory "$I2PAPPDATA"
-    SetOutPath "$I2PAPPDATA"
 
     IfFileExists "$LOCALAPPDATA\I2P\eepsite\docroot" +2 0
         File  /a /r "I2P\eepsite"
 
-    createDirectory "$I2PINSTEXE"
+    createDirectory "$INSTDIR"
-    SetOutPath "$I2PINSTEXE"
+    SetOutPath "$INSTDIR"
 
     SetOutPath "$INSTDIR"
     # create the uninstaller
@@ -257,12 +224,13 @@ SectionEnd
 # uninstaller section start
 Section "uninstall"
     # Uninstall the launcher scripts
-    Delete $INSTDIR\*
+    rmDir /r "$INSTDIR\app"
-    rmDir /r "$INSTDIR\"
+    rmDir /r "$INSTDIR\config"
-    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
+    rmDir /r "$INSTDIR\runtime"
-        Delete $I2PINSTEXE\*
+    Delete "$INSTDIR\ui2pbrowser_icon.ico"
-        rmDir /r "$I2PINSTEXE"
+    Delete "$INSTDIR\windowsUItoopie2.png"
-    ${EndIf}
+    Delete "$INSTDIR\I2P.exe"
+    
 
     # Remove shortcuts and folders
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
@@ -274,11 +242,25 @@ Section "uninstall"
     Delete "$DESKTOP\${APPNAME}.lnk"
     Delete "$DESKTOP\Private Browsing-${APPNAME}.lnk"
     rmDir /r "$SMPROGRAMS\${APPNAME}"
-    rmDir /r "$INSTDIR\firefox.profile.i2p\extensions"
-    rmDir /r "$INSTDIR\firefox.profile.i2p"
-    rmDir /r "$LOCALAPPDATA\${APPNAME}"
-    rmDir /r "$INSTDIR"
     
+    #### SUPER SUPER EXTRA IMPORTANT!
+    ### RELATED: line 169
+    ## IF YOU DO THIS WRONG YOU WILL BREAK CONFIGS:
+    ## The purpose of the `jpackaged` file has changed, as has the point
+    ## where it is created.
+    # 1. The jpackaged file is now created only **after** the jpackage itself
+    #  has migrated default configs into the $INSTDIR. IF THEY ALREADY EXIST,
+    #  it WILL NOT BE CREATED, even if there is a jpackage present. This is
+    #  intentional behavior.
+    # 2. The jpackaged file now indicates that the configurations were created
+    #  by running the jpackage, and not by an un-bundled router. If it is not
+    #  present, then we have already deleted everything we are responsible for
+    #  and don't need to do the section below.
+    ${If} ${FileExists} "$INSTDIR\jpackaged"
+        Delete $INSTDIR\*
+        rmDir /r "$INSTDIR"
+    ${EndIf}
+
     # delete the uninstaller
     Delete "$INSTDIR\uninstall-i2pbrowser.exe"
 
@@ -292,8 +274,8 @@ SectionEnd
 !insertmacro MUI_PAGE_FINISH
 
 Function LaunchLink
-  SetOutPath "$I2PINSTEXE"
+  SetOutPath "$INSTDIR"
-  StrCpy $OUTDIR $I2PINSTEXE
+  StrCpy $OUTDIR $INSTDIR
   ${If} ${Silent}
     ReadEnvStr $0 RESTART_I2P
     ${If} $0 != ""

src/nsis/i2pbrowser-jpackage.nsi

@@ -1 +1 @@
-!define I2P_VERSION 1.9.6
+!define I2P_VERSION 1.9.7

src/nsis/i2pbrowser-version.nsi

@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 9
-!define VERSIONBUILD 6
+!define VERSIONBUILD 7

src/profile/version.txt

@@ -1 +1 @@
-1.9.6
+1.9.7

targz.sh

@@ -5,7 +5,7 @@ cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 

unsigned.sh

@@ -5,7 +5,7 @@ cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi