copy app, runtime individually instead of the parent dir

add buildscript for experimental extension loadout
add /a to signer script
2022-09-01 21:33:32 -04:00 · 2022-08-29 19:56:13 -04:00 · 2022-08-29 09:44:18 -04:00 · 2022-08-28 23:16:39 -04:00 · 2022-08-28 13:58:32 -04:00 · 2022-08-27 11:33:03 -04:00
21 changed files with 66 additions and 21 deletions
--- a/LICENSE.html
+++ b/LICENSE.html
@ -1,12 +1,13 @@
 <html>
  <head>
    <title>
-      I2P Browsing Pro...
+      I2P Easy-Install...
    </title>
    <meta name="author" content="eyedeekay" />
    <meta name="description" content="i2p.firefox" />
    <meta name="keywords" content="master" />
    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
  </head>
  <body>
    <div id="navbar">
@ -98,6 +99,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    </div>
    <div>
      <a href="https://geti2p.net/">
+        <img src="i2plogo.png"></img>
        I2P
      </a>
    </div>
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
-I2P Browsing Profile for Firefox
-================================
+I2P Easy-Install Bundle for Windows(Also/formerly)I2P Browsing Profile for Firefox
+==================================================================================

 Features:
 ---------
--- a/UPDATES.html
+++ b/UPDATES.html
@ -1,12 +1,13 @@
 <html>
  <head>
    <title>
-      I2P Browsing Pro...
+      I2P Easy-Install...
    </title>
    <meta name="author" content="eyedeekay" />
    <meta name="description" content="i2p.firefox" />
    <meta name="keywords" content="master" />
    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
  </head>
  <body>
    <div id="navbar">
@ -135,6 +136,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    </div>
    <div>
      <a href="https://geti2p.net/">
+        <img src="i2plogo.png"></img>
        I2P
      </a>
    </div>
--- a/build.sh
+++ b/build.sh
@ -66,7 +66,7 @@ if [ ! -f "$HERE/build/jna-platform.jar" ]; then
 fi

 if [ ! -f "$HERE/build/i2pfirefox.jar" ]; then
-  wget -O "$HERE/build/i2pfirefox.jar" https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/0.0.13/i2pfirefox.jar
+  wget -O "$HERE/build/i2pfirefox.jar" https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/0.0.16/i2pfirefox.jar
 fi

 cd java
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,9 @@
+2022-08-28 idk
+ * Migrate away from batch scripts and simply launch a browser if I2P is already running.
+  This is more flexible, stable, and simplet to install
+ * Improves compatibility with detatched and un-bundled routers on the same system
+ * Fixes bugs in Firefox path finding
+
 2022-05-8 idk
 * Add translations for Arabic, German, French, Italian, Japanese, Portuguese, Russian,
 and Chinese.
--- a/experimental.sh
+++ b/experimental.sh
@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+./clean.sh
+wsl make distclean
+wsl make clean-extensions
+wsl make new-extensions
+./build.sh
+wsl make
--- a/i2plogo.png
+++ b/i2plogo.png
--- a/8
+++ b/8
@ -6,12 +6,12 @@ export JNA_VERSION=5.11.0
 #Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=1
-VERSIONMINOR=8
-VERSIONBUILD=1
+VERSIONMINOR=9
+VERSIONBUILD=0
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
-VERSION=i2p-1.8.8
-export VERSION=i2p-1.8.0
+VERSION=i2p-1.9.0
+export VERSION=i2p-1.9.0

 #Uncomment this to build from the tip of the master.
 #I2P_VERSION=1.8.0
--- a/index.html
+++ b/index.html
@ -1,12 +1,13 @@
 <html>
  <head>
    <title>
-      I2P Browsing Pro...
+      I2P Easy-Install...
    </title>
    <meta name="author" content="eyedeekay" />
    <meta name="description" content="i2p.firefox" />
    <meta name="keywords" content="master" />
    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
  </head>
  <body>
    <div id="navbar">
@ -40,7 +41,7 @@
      </div>
    </div>
    <h1>
-      I2P Browsing Profile for Firefox
+      I2P Easy-Install Bundle for Windows(Also/formerly)I2P Browsing Profile for Firefox
    </h1>
    <h2>
      Features:
@ -714,6 +715,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    </div>
    <div>
      <a href="https://geti2p.net/">
+        <img src="i2plogo.png"></img>
        I2P
      </a>
    </div>
--- a/makefiles/app-profile.mk
+++ b/makefiles/app-profile.mk
@ -11,6 +11,8 @@ src/app-profile/user.js:
 	wget -O src/app-profile/user.js "https://github.com/arkenfox/user.js/raw/master/user.js"
 	sed -i 's|user_pref("extensions.autoDisableScopes", 15);|user_pref("extensions.autoDisableScopes", 0);|g src/app-profile/user.js
 	sed -i 's|user_pref("extensions.enabledScopes", 5);|user_pref("extensions.enabledScopes", 1);|g' src/app-profile/user.js
+	sed -i 's|user_pref("dom.security.https_only_mode", true);|user_pref("dom.security.https_only_mode", false);|g' src/app-profile/user.js
+	

 build/app-profile/user.js: build/app-profile src/app-profile/user.js
 	cp src/app-profile/user.js build/app-profile/user.js
--- a/makefiles/new-extensions.mk
+++ b/makefiles/new-extensions.mk
@ -2,7 +2,7 @@
 build-new-extensions: build/i2ppb@eyedeekay.github.io.xpi build/uBlock0@raymondhill.net.xpi build/jsr@javascriptrestrictor.xpi build/onioncbt@eyedeekay.github.io.xpi build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi

 build/uBlock0@raymondhill.net.xpi:
-	curl -L `cat UblockOrigin.url` > build/uBlock0@raymondhill.net.xpi
+	curl -L `cat UBlockOrigin.url` > build/uBlock0@raymondhill.net.xpi

 build/jsr@javascriptrestrictor.xpi:
 	curl -L `cat JShelter.url` > build/jsr@javascriptrestrictor.xpi
--- a/makefiles/profile.mk
+++ b/makefiles/profile.mk
@ -12,6 +12,7 @@ src/profile/user.js:
 	wget -O src/profile/user.js "https://github.com/arkenfox/user.js/raw/master/user.js"
 	sed -i 's|user_pref("extensions.autoDisableScopes", 15);|user_pref("extensions.autoDisableScopes", 0);|g src/profile/user.js
 	sed -i 's|user_pref("extensions.enabledScopes", 5);|user_pref("extensions.enabledScopes", 1);|g' src/profile/user.js
+	sed -i 's|user_pref("dom.security.https_only_mode", true);|user_pref("dom.security.https_only_mode", false);|g' src/profile/user.js

 build/profile/user.js: build/profile src/profile/user.js
 	cp src/profile/user.js build/profile/user.js
--- a/showhider.css
+++ b/showhider.css
@ -0,0 +1,10 @@
+/* edgar showhider CSS file */
+#show {display:none; }
+#hide {display:block; }
+#show:target {display: block; }
+#hide:target {display: none; }
+
+#shownav {display:none; }
+#hidenav {display:block; }
+#shownav:target {display: block; }
+#hidenav:target {display: none; }
--- a/sign.sh
+++ b/sign.sh
@ -40,6 +40,6 @@ if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
    linuxsign I2P-Profile-Installer-$I2P_VERSION.exe
    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
 else
-    signtool.exe sign "I2P-Profile-Installer-$I2P_VERSION.exe"
+    signtool.exe sign /a "I2P-Profile-Installer-$I2P_VERSION.exe"
    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
 fi
--- a/src/app-profile/user.js
+++ b/src/app-profile/user.js
@ -517,7 +517,7 @@ user_pref("security.mixed_content.block_display_content", true);
 * [SETTING] Privacy & Security>HTTPS-Only Mode (and manage exceptions)
 * [TEST] http://example.com [upgrade]
 * [TEST] http://httpforever.com/ [no upgrade] ***/
-user_pref("dom.security.https_only_mode", true); // [FF76+]
+user_pref("dom.security.https_only_mode", false); // [FF76+]
 // user_pref("dom.security.https_only_mode_pbm", true); // [FF80+]
 /* 1245: enable HTTPS-Only mode for local resources [FF77+] ***/
 // user_pref("dom.security.https_only_mode.upgrade_local", true);
--- a/src/app-profile/version.txt
+++ b/src/app-profile/version.txt
@ -1 +1 @@
-1.8.1
+1.9.0
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@ -191,8 +191,11 @@ FunctionEnd

 Function routerDetect
    createDirectory $I2PINSTEXE
+    SetOutPath $I2PINSTEXE/app
+    File /nonfatal /a /r "I2P\app\"
+    SetOutPath $I2PINSTEXE/runtime
+    File /nonfatal /a /r "I2P\runtime\"
    SetOutPath $I2PINSTEXE
-    File /nonfatal /a /r "I2P\"
    File /nonfatal /a /r "I2P\I2P.exe"
    File /nonfatal "I2P\config\jpackaged"

--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@ -1 +1 @@
-!define I2P_VERSION 1.8.1
+!define I2P_VERSION 1.9.0
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@ -1,3 +1,3 @@
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 8
-!define VERSIONBUILD 1
+!define VERSIONMINOR 9
+!define VERSIONBUILD 0
--- a/src/profile/user.js
+++ b/src/profile/user.js
@ -517,7 +517,7 @@ user_pref("security.mixed_content.block_display_content", true);
 * [SETTING] Privacy & Security>HTTPS-Only Mode (and manage exceptions)
 * [TEST] http://example.com [upgrade]
 * [TEST] http://httpforever.com/ [no upgrade] ***/
-user_pref("dom.security.https_only_mode", true); // [FF76+]
+user_pref("dom.security.https_only_mode", false); // [FF76+]
 // user_pref("dom.security.https_only_mode_pbm", true); // [FF80+]
 /* 1245: enable HTTPS-Only mode for local resources [FF77+] ***/
 // user_pref("dom.security.https_only_mode.upgrade_local", true);
--- a/src/profile/version.txt
+++ b/src/profile/version.txt
@ -1 +1 @@
-1.8.1
+1.9.0
Author	SHA1	Message	Date
idk	0ad9406387	copy app, runtime individually instead of the parent dir	2022-09-01 21:33:32 -04:00
idk	21b396e343	add buildscript for experimental extension loadout	2022-08-29 19:56:13 -04:00
idk	910aeed82c	add /a to signer script	2022-08-29 09:44:18 -04:00
idk	2f0e553b20	update changelog	2022-08-28 23:16:39 -04:00
idk	bc33051d8d	bump version	2022-08-28 13:58:32 -04:00
idk	e4d0be36c9	update UPDATES.html	2022-08-27 11:33:03 -04:00
idk	9374b1b274	update LICENSE.html	2022-08-27 11:32:59 -04:00
idk	e4e3df90dc	update index.html	2022-08-27 11:32:55 -04:00
idk	acb66c97d0	update page title	2022-08-27 11:31:04 -04:00
idk	a8ac47966c	update i2p.plugin.firefox version	2022-08-22 17:36:15 -04:00
idk	acf67d93c6	disable https-only mode to get rid of warning from profile	2022-08-21 19:01:40 -04:00
idk	07f7b84817	update the i2pfirefox version one last time	2022-08-21 18:15:04 -04:00
 @ -1 +1 @@
 .8.1
 .9.0