exit with status 0

build.sh

@@ -72,6 +72,7 @@ fi
 
 cd java
 "$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
+  net/i2p/router/CopyConfigDir.java \
   net/i2p/router/Elevator.java \
   net/i2p/router/Shell32X.java \
   net/i2p/router/WinLauncher.java \

daily.sh

@@ -50,6 +50,6 @@ ZIPCHECKSUM=$(sha256sum "../I2P.zip")
 echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
 github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
 
-TARCHECKSUM=$(sha256sum "i2p.i2p.jpackage-build.tar.gz")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+TARCHECKSUM=$(sha256sum "../../i2p.i2p.jpackage-build.tar.gz")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"

exe.sh

@@ -6,6 +6,7 @@
 
 . ./config.sh
 . ./i2pversion
+./build.sh
 jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
@@ -15,16 +16,7 @@ jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
-    --app-content build/I2P/config/certificates \
-    --app-content build/I2P/config/eepsite \
-    --app-content build/I2P/config/geoip \
-    --app-content build/I2P/config/webapps \
-    --app-content build/I2P/config/clients.config \
-    --app-content build/I2P/config/hosts.txt \
-    --app-content build/I2P/config/i2ptunnel.config \
-    --app-content build/I2P/config/jpackaged \
-    --app-content build/I2P/config/router.config \
-    --app-content build/I2P/config/wrappper.config \
+    --app-content src/I2P/config \
     --input build \
     --verbose \
     --type exe \

java/net/i2p/router/CopyConfigDir.java

@@ -5,55 +5,100 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 public class CopyConfigDir {
+  static Logger logger = Logger.getLogger("configlog");
+  static WindowsUpdatePostProcessor wupp = null;
+  static FileHandler fh;
 
-  public boolean copyDirectory(String baseDir, String workDir) {
+  public CopyConfigDir() {
+    try {
+      // This block configure the logger with handler and formatter
+      fh = new FileHandler(logFile().toString());
+      logger.addHandler(fh);
+      SimpleFormatter formatter = new SimpleFormatter();
+      fh.setFormatter(formatter);
+      // the following statement is used to log any messages
+      logger.info("My first log");
+    } catch (SecurityException e) {
+      e.printStackTrace();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+  }
+
+  public static boolean copyDirectory(String baseDir, String workDir) {
     File baseFile = new File(baseDir);
     File workFile = new File(workDir);
     return copyDirectory(baseFile, workFile);
   }
 
-  public boolean copyDirectory(File baseDir, File workDir) {
+  public static boolean copyDirectory(File baseDir, File workDir) {
     for (File file : baseDir.listFiles()) {
-      System.out.println(file.getAbsolutePath());
+      String fPath = file.getAbsolutePath().replace(
+          file.getParentFile().getAbsolutePath(), "");
+      String newPath = workDir.toString() + fPath;
       if (file.isDirectory())
-        copyDirectory(file, new File(workDir, file.toString()));
+        if (copyDirectory(file, new File(newPath)))
+          return false;
       if (file.isFile())
-        copyFileNeverOverwrite(file, new File(workDir, file.toString()));
+        if (!copyFile(file, new File(newPath), true))
+          return false;
     }
     return true;
   }
 
-  public boolean copyConfigDirectory(File baseDir, File workDir) {
+  public static boolean copyConfigDirectory(File baseDir, File workDir) {
     for (File file : baseDir.listFiles()) {
-      System.out.println(file.getAbsolutePath());
+      // System.out.println(file.getAbsolutePath());
+      String fPath = file.getAbsolutePath().replace(
+          file.getParentFile().getAbsolutePath(), "");
+      String newPath = workDir.toString() + fPath;
       if (file.isDirectory())
-        copyDirectory(file, new File(workDir, file.toString()));
+        if (!copyConfigDirectory(file, new File(newPath)))
+          return false;
       if (file.isFile())
-        copyFileNeverOverwrite(file, new File(workDir, file.toString()));
+        if (!copyFileNeverOverwrite(
+                file,
+                new File(newPath))) // new File(workDir, file.toString())))
+          return false;
     }
     return true;
   }
 
-  public boolean copyFileNeverOverwrite(String basePath, String workPath) {
+  public static boolean copyFileNeverOverwrite(String basePath,
+                                               String workPath) {
     File baseFile = new File(basePath);
     File workFile = new File(workPath);
     return copyFileNeverOverwrite(baseFile, workFile);
   }
 
-  public boolean copyFileNeverOverwrite(File basePath, File workPath) {
+  public static boolean copyFileNeverOverwrite(File basePath, File workPath) {
     return copyFile(basePath, workPath, false);
   }
 
-  public boolean copyFile(File basePath, File workPath, boolean overWrite) {
+  public static boolean copyFile(File basePath, File workPath,
+                                 boolean overWrite) {
     if (!basePath.exists()) {
+      logger.info(basePath.getAbsolutePath() + " doesn't exist, not copying");
       return false;
     }
+
     if (!overWrite && workPath.exists()) {
-      return false;
+      logger.info(workPath.getAbsolutePath() +
+                  " already exists, not overwriting");
+      return true;
+    }
+
+    File workDir = workPath.getParentFile();
+    if (!workDir.exists()) {
+      workDir.mkdirs();
     }
     try (InputStream in =
              new BufferedInputStream(new FileInputStream(basePath));
@@ -70,7 +115,179 @@ public class CopyConfigDir {
       out.close();
       return true;
     } catch (Throwable e) {
+      logger.warning(e.toString());
+      logger.warning("failed to copy " + basePath.getAbsolutePath() + " to " +
+                     workPath.getAbsolutePath());
       return false;
     }
   }
+
+  protected static File selectHome() { // throws Exception {
+    String path_override = System.getenv("I2P_CONFIG");
+    if (path_override != null) {
+      File path = new File(path_override);
+      if (path != null && path.exists()) {
+        if (path.isDirectory())
+          return path.getAbsoluteFile();
+        else
+          throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
+      }
+    }
+    if (osName() == "windows") {
+      File i2p = appImageHome();
+      logger.info("Checking for signs of life in I2P directory: " + i2p);
+      return i2p;
+    } else {
+      File i2p = appImageHome();
+      File programs = new File(i2p, ".i2p");
+      logger.info("Linux portable jpackage wrapper starting up, using: " +
+                  programs + " as base config");
+      return programs.getAbsoluteFile();
+    }
+  }
+
+  protected static File selectProgramFile() {
+    String path_override = System.getenv("I2P");
+    if (path_override != null) {
+      File path = new File(path_override);
+      if (path.exists()) {
+        if (path.isDirectory())
+          return path.getAbsoluteFile();
+        else
+          throw new RuntimeException("I2P is not a directory: " + path);
+      }
+    }
+    if (osName() == "windows") {
+      File jrehome = new File(System.getProperty("java.home"));
+      File programs = jrehome.getParentFile();
+      logger.info("Windows portable jpackage wrapper found, using: " +
+                  programs + " as working config");
+      return programs.getAbsoluteFile();
+    } else {
+      File jrehome = new File(System.getProperty("java.home"));
+      File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
+      logger.info("Linux portable jpackage wrapper found, using: " + programs +
+                  " as working config");
+      return programs.getAbsoluteFile();
+    }
+  }
+
+  /**
+   * 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,
+   * relative to the root of the app-image on each platform:
+   *
+   * Windows - Root of appimage is 1 directory above directory named runtime
+   *     ./runtime
+   *
+   * Linux - Root of appimage is 2 directories above directory named runtime
+   *     ./lib/runtime
+   *
+   * Mac OSX - Unknown for now
+   *
+   * @return
+   */
+  protected static File javaHome() {
+    File jrehome = new File(System.getProperty("java.home"));
+    if (jrehome != null) {
+      if (jrehome.exists()) {
+        return jrehome;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the root 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.
+   *
+   * @return the app-image root
+   */
+  protected static File appImageHome() {
+    File jreHome = javaHome();
+    if (jreHome != null) {
+      switch (osName()) {
+      case "windows":
+        return jreHome.getAbsoluteFile().getParentFile();
+      case "mac":
+      case "linux":
+        return jreHome.getAbsoluteFile().getParentFile().getParentFile();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the default config of the app-image by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information, then appending the config directory to the end onn a
+   * per-platform basis
+   *
+   * @return the app-image root
+   */
+  protected static File appImageConfig() {
+    File aih = appImageHome();
+    if (aih == null) {
+      return null;
+    }
+    String osName = osName();
+    switch (osName) {
+    case "windows":
+      File winConfigDir = new File(aih, "config");
+      if (winConfigDir != null) {
+        if (winConfigDir.exists()) {
+          return winConfigDir;
+        }
+      }
+    case "mac":
+    case "linux":
+      File linConfigDir = new File(aih, "lib/config");
+      if (linConfigDir != null) {
+        if (linConfigDir.exists()) {
+          return linConfigDir;
+        }
+      }
+    }
+    return null;
+  }
+
+  protected static boolean copyConfigDir() {
+    File appImageConfigDir = appImageConfig();
+    File appImageHomeDir = appImageHome();
+    return copyConfigDirectory(appImageConfigDir, appImageHomeDir);
+  }
+
+  /**
+   * set up the path to the log file
+   *
+   * @return
+   */
+  protected static File logFile() { return logFile("launcher.log"); }
+
+  /**
+   * set up the path to the log file
+   *
+   * @return
+   */
+  protected static File logFile(String p) {
+    File log = new File(selectProgramFile(), "logs");
+    if (!log.exists())
+      log.mkdirs();
+    return new File(log, p);
+  }
 }

java/net/i2p/router/WinLauncher.java

@@ -18,7 +18,6 @@ import net.i2p.router.RouterLaunch;
 import net.i2p.update.*;
 import net.i2p.update.UpdateManager;
 import net.i2p.update.UpdatePostProcessor;
-import net.i2p.util.SystemVersion;
 
 /**
  * Launches a router from %PROGRAMFILES%/I2P using configuration data in
@@ -30,9 +29,9 @@ import net.i2p.util.SystemVersion;
  * appdata
  * router.pid - the pid of the java process.
  */
-public class WinLauncher {
-  static Logger logger = Logger.getLogger("launcherlog");
-  static FileHandler fh;
+public class WinLauncher extends CopyConfigDir {
+  static WindowsUpdatePostProcessor wupp = null;
+  private static Router i2pRouter;
 
   public static void main(String[] args) throws Exception {
     setupLauncher();
@@ -88,16 +87,12 @@ public class WinLauncher {
     File programs = programFile();
     File home = homeDir();
 
-    // TODO: I want to minimize the amount of stuff I have to rely on NSIS for
-    // and if I
-    // 1. make the config directory inclusion part of the jpackage step
-    // and
-    // 2. make the launcher copy new or missing config files at launch
-    // then NSIS serves primarily as a way of providing multilanguage
-    // support in the installer. It has a higher degree of customization,
-    // but probably ceases to be necessary, I can make jpackage generate
-    // the installer, **and** I get to build every other kind of jpackage
-    // powered package.
+    // 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)) {
@@ -111,6 +106,7 @@ public class WinLauncher {
     logger.info("\t" + System.getProperty("i2p.dir.base") + "\n\t" +
                 System.getProperty("i2p.dir.config") + "\n\t" +
                 System.getProperty("router.pid"));
+
     /**
      * IMPORTANT: You must set user.dir to the same directory where the
      * jpackage is intstalled, or when the launcher tries to re-run itself
@@ -119,7 +115,7 @@ public class WinLauncher {
      */
     System.setProperty("user.dir", programs.getAbsolutePath());
 
-    // wupp.i2pRouter = new Router(System.getProperties());
+    i2pRouter = new Router(System.getProperties());
     logger.info("Router is configured");
 
     Thread registrationThread = new Thread(REGISTER_UPP);
@@ -128,8 +124,9 @@ public class WinLauncher {
     registrationThread.start();
 
     setNotStarting();
-    // wupp.i2pRouter.runRouter();
-    RouterLaunch.main(args);
+
+    i2pRouter.runRouter();
+    System.exit(0);
   }
 
   private static void setupLauncher() {
@@ -146,7 +143,7 @@ public class WinLauncher {
     } catch (IOException e) {
       e.printStackTrace();
     }
-    
+
     File jrehome = javaHome();
     logger.info("jre home is: " + jrehome.getAbsolutePath());
     File appimagehome = appImageHome();
@@ -298,9 +295,8 @@ public class WinLauncher {
   }
 
   private static final Runnable REGISTER_UPP = () -> {
-    // first wait for the RouterContext to appear
     RouterContext ctx;
-    while ((ctx = (RouterContext)RouterContext.getCurrentContext()) == null) {
+    while ((ctx = i2pRouter.getContext()) == null) {
       sleep(1000);
     }
     // then wait for the update manager
@@ -318,161 +314,6 @@ public class WinLauncher {
     um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
   };
 
-  private static File selectHome() { // throws Exception {
-    String path_override = System.getenv("I2P_CONFIG");
-    if (path_override != null) {
-      File path = new File(path_override);
-      if (path != null && path.exists()) {
-        if (path.isDirectory())
-          return path.getAbsoluteFile();
-        else
-          throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
-      }
-    }
-    if (SystemVersion.isWindows()) {
-      File i2p = appImageHome();
-      logger.info("Checking for signs of life in I2P directory: " + i2p);
-      return i2p;
-    } else {
-      File i2p = appImageHome();
-      File programs = new File(i2p, ".i2p");
-      logger.info("Linux portable jpackage wrapper starting up, using: " +
-                  programs + " as base config");
-      return programs.getAbsoluteFile();
-    }
-  }
-
-  private static File selectProgramFile() {
-    String path_override = System.getenv("I2P");
-    if (path_override != null) {
-      File path = new File(path_override);
-      if (path.exists()) {
-        if (path.isDirectory())
-          return path.getAbsoluteFile();
-        else
-          throw new RuntimeException("I2P is not a directory: " + path);
-      }
-    }
-    if (SystemVersion.isWindows()) {
-      File jrehome = new File(System.getProperty("java.home"));
-      File programs = jrehome.getParentFile();
-      logger.info("Windows portable jpackage wrapper found, using: " +
-                  programs + " as working config");
-      return programs.getAbsoluteFile();
-    } else {
-      File jrehome = new File(System.getProperty("java.home"));
-      File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
-      logger.info("Linux portable jpackage wrapper found, using: " + programs +
-                  " as working config");
-      return programs.getAbsoluteFile();
-    }
-  }
-
-  /**
-   * get the OS name(windows, mac, linux only)
-   *
-   * @return os name in lower-case, "windows" "mac" or  "linux"
-   */
-  private 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,
-   * relative to the root of the app-image on each platform:
-   *
-   * Windows - Root of appimage is 1 directory above directory named runtime
-   *     ./runtime
-   *
-   * Linux - Root of appimage is 2 directories above directory named runtime
-   *     ./lib/runtime
-   *
-   * Mac OSX - Unknown for now
-   *
-   * @return
-   */
-  private static File javaHome() {
-    File jrehome = new File(System.getProperty("java.home"));
-    if (jrehome != null) {
-      if (jrehome.exists()) {
-        return jrehome;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * get the path to the root 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.
-   *
-   * @return the app-image root
-   */
-  private static File appImageHome() {
-    File jreHome = javaHome();
-    if (jreHome != null) {
-      switch (osName()) {
-      case "windows":
-        return jreHome.getAbsoluteFile().getParentFile();
-      case "mac":
-      case "linux":
-        return jreHome.getAbsoluteFile().getParentFile().getParentFile();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * get the path to the default config of the app-image by getting the path to
-   * java.home and the OS, and traversing up to the app-image root based on that
-   * information, then appending lib/config to the end.
-   *
-   * @return the app-image root
-   */
-  private static File appImageConfig() {
-    File aih = appImageHome();
-    if (aih == null) {
-      return null;
-    }
-    String osName = osName();
-    switch (osName) {
-    case "windows":
-      File winConfigDir = new File(aih, "config");
-      if (winConfigDir != null) {
-        if (winConfigDir.exists()) {
-          return winConfigDir;
-        }
-      }
-    case "mac":
-    case "linux":
-      File linConfigDir = new File(aih, "lib/config");
-      if (linConfigDir != null) {
-        if (linConfigDir.exists()) {
-          return linConfigDir;
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * set up the path to the log file
-   *
-   * @return
-   */
-  private static File logFile() {
-    File log = new File(selectProgramFile(), "logs");
-    if (!log.exists())
-      log.mkdirs();
-    return new File(log, "launcher.log");
-  }
-
   /**
    * sleep for 1 second
    *

msi.sh

@@ -6,6 +6,8 @@
 
 . ./config.sh
 . ./i2pversion
+
+./build.sh
 jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
@@ -15,16 +17,7 @@ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
-    --app-content build/I2P/config/certificates \
-    --app-content build/I2P/config/eepsite \
-    --app-content build/I2P/config/geoip \
-    --app-content build/I2P/config/webapps \
-    --app-content build/I2P/config/clients.config \
-    --app-content build/I2P/config/hosts.txt \
-    --app-content build/I2P/config/i2ptunnel.config \
-    --app-content build/I2P/config/jpackaged \
-    --app-content build/I2P/config/router.config \
-    --app-content build/I2P/config/wrappper.config \
+    --app-content src/I2P/config \
     --input build \
     --verbose \
     --type msi \