keep a static ref to the router

BUILD.md

@@ -72,7 +72,6 @@ In order to configure your release environment, you must set the following
 environment variables:
 
  - `I2P_SIGNER` should be the [Apple Developer ID of the signer](https://developer.apple.com/support/developer-id/)
- - `I2P_CODE_SIGNER` should be the Apple Developer ID for Code Signing of the signer(Usually find this with `security find-identity -v -p codesigning`)
  - `I2P_VERSION` should be the version of the I2P router that you want to use
  - `I2P_BUILD_NUMBER` should be an integer greater than `0`.
 

README.md

@@ -30,16 +30,10 @@ In order to build an AppBundle that can work from anywhere, it is necessary to u
 1. You need an "app-specific password" which you can create at https://appleid.apple.com
 2. Execute 
 ```
-xcrun notarytool store-credentials "$AC_PASSWORD"
-               --apple-id "$AC_USERNAME"
-               --team-id "$WWDRTeamID"
-               --password "$secret_2FA_password"
+xcrun altool --eval-app --primary-bundle-id net.i2p.router -u <your Apple id> -f <name of the .dmg file>
 ```
- - In this example command:
- - `AC_PASSWORD` is the name of the credentials config.
- - `AC_USERNAME` is the username of the Apple Account.
- - `WWDRTeamID` is the developer/team ID available from the Apple Account.
- - `secret_2FA_Password` is the app-specific password you set up in the first step.
+This will ask you for the password you generated in step 1 and will return a long UUID string you can use to check the progress.
+
 3. Periodically execute the following to check the progress of the notarisation:
 ```
 xcrun altool --eval-info <the long UUID string> -u <your Apple id>

build.sh

@@ -21,6 +21,7 @@ fi
 
 if [ -z "${I2P_SIGNER}" ]; then
     echo "I2P_SIGNER variable not set, can't sign. Script will terminate after unsigned app-image generation"
+    exit 1
 fi
 
 if [ -z ${I2P_VERSION} ]; then
@@ -66,25 +67,17 @@ cd ..
 echo "compiling native lib"
 cc -v -Wl,-lobjc -mmacosx-version-min=10.9 -I"$JAVA_HOME/include" -I"$JAVA_HOME/include/darwin" -Ic -o build/libMacLauncher.jnilib -shared c/net_i2p_router_MacLauncher.c 
 
-if [ -z $I2P_SIGNER ]; then
-    echo "I2P_SIGNER is unset, not proceeding to sign jbigi libs"
-    cp $I2P_JARS/jbigi.jar build
-else
-    echo "signing jbigi libs"
-    mkdir jbigi
-    cp $I2P_JARS/jbigi.jar jbigi
-    cd jbigi
-    unzip jbigi.jar
-    for lib in *.jnilib; do
-        codesign --force -s $I2P_SIGNER -v $lib
-        jar uf jbigi.jar $lib
-    done
-    cp jbigi.jar ../build
-    cd ..
-fi
-
-
-
+echo "signing jbigi libs"
+mkdir jbigi
+cp $I2P_JARS/jbigi.jar jbigi
+cd jbigi
+unzip jbigi.jar
+for lib in *.jnilib; do
+    codesign --force -s $I2P_SIGNER -v $lib
+    jar uf jbigi.jar $lib
+done
+cp jbigi.jar ../build
+cd ..
 
 I2P_VERSION=$(java -cp build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1)
 echo "preparing to invoke jpackage for I2P version $I2P_VERSION build $I2P_BUILD_NUMBER"
@@ -134,21 +127,15 @@ if [ -z $I2P_SIGNER ]; then
     exit 0 
 fi
 
-
-echo "signing the runtime libraries"
-
-if [ $I2P_CODE_SIGNER = signer@mail.i2p ]; then
-    echo "I2P_CODE_SIGNER is unset, not signing dylibs or jnilibs, app will fail notarization"
-else
-    find I2P.app -name *.dylib -exec codesign --force -s $I2P_CODE_SIGNER -v '{}' \;
-    find I2P.app -name *.jnilib -exec codesign --force -s $I2P_CODE_SIGNER -v '{}' \;
-fi
-
-if [ $I2P_SIGNER = signer@mail.i2p ]; then
+if [ $I2P_SIGNER = signer@mail.i2p]; then
     echo "I2P_SIGNER is unset, not proceeding to signing phase"
     exit 0 
 fi
 
+echo "signing the runtime libraries"
+find I2P.app -name *.dylib -exec codesign --force -s $I2P_SIGNER -v '{}' \;
+find I2P.app -name *.jnilib -exec codesign --force -s $I2P_SIGNER -v '{}' \;
+
 echo "signing the bundle"
 codesign --force -d --deep -f \
     --options=runtime \

config.sh

@@ -1,26 +1,5 @@
 #! /usr/bin/env sh
 
-if [ -z $I2P_SIGNER ]; then
-    # This is the team ID of the Apple account associated with the app. It is used to sign the DMG.
-    # it is a unique ID which is a short, random-looking string.
-    I2P_SIGNER=signer@mail.i2p
-fi
-if [ -z $I2P_CODE_SIGNER ]; then
-    # This is the code signing ID of the team associated with the Apple Account. it is used to sign the libraries.
-    # it is a unique ID which is a short, random-looking string.
-    I2P_SIGNER=signer@mail.i2p
-fi
-if [ -z $I2P_VERSION ]; then
-    I2P_VERSION=2.0.0
-fi
-if [ -z $I2P_BUILD_NUMBER ]; then
-    I2P_BUILD_NUMBER=1
-fi
-# Uncomment/Edit this line to include the signer in the config file
-# I2P_SIGNER=signer@mail.i2p
-# Uncomment/Edit this line to include the code signer in the config file
-# I2P_CODE_SIGNER=signer@mail.i2p
-# Uncomment/Edit this line to include the version number in the config file
-# I2P_VERSION=2.0.0
-# Uncomment/Edit this line to include the build number in the config file
-# I2P_BUILD_NUMBER=1
+I2P_SIGNER=signer@mail.i2p
+I2P_VERSION=2.0.0
+I2P_BUILD_NUMBER=1

java/net/i2p/router/MacLauncher.java

@@ -18,6 +18,7 @@ public class MacLauncher {
 
     /** this is totally undocumented */
     private static final String APP_PATH = "jpackage.app-path";
+    private static Router i2pRouter;
 
     public static void main(String[] args) throws Exception {
         String path = System.getProperty(APP_PATH,"unknown");
@@ -42,12 +43,30 @@ public class MacLauncher {
         }
 
 
+        i2pRouter = new Router(System.getProperties());
+
         Thread registrationThread = new Thread(REGISTER_UPP);
         registrationThread.setName("UPP Registration");
         registrationThread.setDaemon(true);
         registrationThread.start();
 
-        RouterLaunch.main(args);
+        String arch = System.getProperty("os.arch");
+        if (arch.equals("aarch64")) {
+            changeSetting(i2pRouter, "router.newsURL", "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/mac-arm64/stable/news.su3");
+            changeSetting(i2pRouter, "router.backupNewsURL", "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/mac-arm64/stable/news.su3");
+        } else {
+            changeSetting(i2pRouter, "router.newsURL", "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/mac/stable/news.su3");
+            changeSetting(i2pRouter, "router.backupNewsURL", "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/mac/stable/news.su3");
+        }
+
+        i2pRouter.runRouter();
+    }
+
+    private static void changeSetting(Router i2pRouter, String key, String value){
+        String setting = i2pRouter.getConfigSetting(key);
+        if (setting == null) {
+            i2pRouter.saveConfig(key, value);
+        }
     }
 
     private static native void disableAppNap();