From 1aba1177c2f2e1901f3409fe3fb56d9c5b75971d Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 30 Oct 2021 20:38:55 -0400 Subject: [PATCH 01/16] Add flags to jpackage for plugins that use reflection to work. Add a warning if compiling with less than Java 17 and sleep longer if using less than java 17. --- build.sh | 8 ++++++++ debian/files | 2 ++ 2 files changed, 10 insertions(+) create mode 100644 debian/files diff --git a/build.sh b/build.sh index 3a3ba16..2abf6f5 100755 --- a/build.sh +++ b/build.sh @@ -13,6 +13,10 @@ if [ "$JAVA" -lt "14" ]; then echo "Java 14+ must be used to compile with jpackage, java is $JAVA" exit 1 fi +if [ "$JAVA" -lt "17" ]; then + echo "It is highly recommended that you use Java 17+ to build release packages" + sleep 5s +fi sleep 2s if [ -z "${JAVA_HOME}" ]; then @@ -55,6 +59,10 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION" "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \ --verbose \ + --java-options "-Xmx512m" \ + --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \ + --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \ + --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \ $JPACKAGE_OPTS \ --resource-dir build \ --java-options "--illegal-access=permit" \ diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..d24626b --- /dev/null +++ b/debian/files @@ -0,0 +1,2 @@ +i2p-firefox-profile_1.05.0-1_all.deb net optional +i2p-firefox-profile_1.05.0-1_amd64.buildinfo net optional From 28fc12d1be45779f001b38933d7d7d4a2296da6b Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 1 Nov 2021 14:25:26 -0400 Subject: [PATCH 02/16] update the changelog --- changelog.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/changelog.txt b/changelog.txt index a1af88d..bb82cc4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,45 @@ +2021-11-1 idk +* HTTPS Everywhere will now self-disable on some Firefox versions. This is not + an issue since HTTPS Everywhere is deprecated in favor of Firefox built-in + HTTPS enforcement features. +* .bat Script: Detect location of C:\Program Files\I2P or + C\Program Files(x86)\I2P in launcher scripts +* NSIS changes + - Make launcher scripts static artifacts instead of generating them during + the install process + - If a jpackaged I2P router is present in $checkout/I2P, include it in an + installer. + - If a running installer doesn't find an I2P router in Program Files, install + the jpackaged I2P router. Mark it as jpackaged so we can quickly determine + from other applications. +* I2P in Private Browsing changes + - bugfix for `reset()` of dynamic theme + - bugfix for erroneous redirect/contain of mis-identified I2PSnark containers + - improve support for in-I2P HTTPS + - use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent + - improve support for I2PSnark web handler in + - icon update(@sadie) + - contain android-incompatible features so they won't be executed on Fennec + - translate into Spanish + - visually conceal/reveal features based on whether they are enabled/configured. +* I2P Jpackage + - support for building an I2P Jpackage has been added to the build system + Note that support is platform-specific, to build a Windows jpackage one must + use a Windows OS, to build a Linux jpackage one must use a Linux OS. Only + Windows jpackages are used for a release product. + - For information about how releases are built see README.md and UPDATES.md + - The jpackaged router has the following differences from mainline I2P: + - The jars are installed to a different directory. + - The native libraries are installed to a different directory + - The wrapper script is not installed and not used, and replaced by the + browser launcher. + - The I2P executable is %programfiles%/I2P/I2P.exe, command-line flags are not + compatible but configuration files are. + - wrapper.config is unused + - The built-by entry will reflect that idk built the package + - Use flags to achieve compatibility with plugins that use Reflection on Java + 17 jpackages + 2021-01-17 idk * Use Local Application Data instead of Roaming application data for router.config file * Use Roaming Application Daya only if a clients.config.d is present, indicating that the From 060db1cff68678e12b84f011dc0ba3d61b08bb4d Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 1 Nov 2021 14:26:42 -0400 Subject: [PATCH 03/16] update changelog entries --- changelog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index bb82cc4..0c9b41b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -16,8 +16,8 @@ - bugfix for `reset()` of dynamic theme - bugfix for erroneous redirect/contain of mis-identified I2PSnark containers - improve support for in-I2P HTTPS - - use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent - - improve support for I2PSnark web handler in + - use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent(@sadie) + - improve support for I2PSnark web handler in HTTPS tabs - icon update(@sadie) - contain android-incompatible features so they won't be executed on Fennec - translate into Spanish From a9563fd7636f665c5868f60217783c488c57a986 Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 6 Nov 2021 13:21:24 -0400 Subject: [PATCH 04/16] update version in build system --- i2pversion | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/i2pversion b/i2pversion index 96c59a0..bfdb7ee 100644 --- a/i2pversion +++ b/i2pversion @@ -3,9 +3,9 @@ #Comment this out to build from an alternate branch or # the tip of the master branch. -I2P_VERSION=1.5.0 -export I2P_VERSION=1.5.0 -VERSION=i2p-"$I2P_VERSION" +I2P_VERSION=1.5.1 +export I2P_VERSION=1.5.1 +VERSION=i2p-jpackage-"$I2P_VERSION" export VERSION="$VERSION" #Uncomment this to build from the tip of the master. From 187cf7dfef90dafba0127795fcfdb1e7b8e3ecc0 Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 6 Nov 2021 13:48:41 -0400 Subject: [PATCH 05/16] Add upload targets for the jpackage zips --- Makefile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Makefile b/Makefile index d2e9a9a..78f98dd 100644 --- a/Makefile +++ b/Makefile @@ -306,3 +306,25 @@ releases.json: torrent @echo " }" | tee -a ../i2p.newsxml/data/win/beta/releases.json @echo " }" | tee -a ../i2p.newsxml/data/win/beta/releases.json @echo "]" | tee -a ../i2p.newsxml/data/win/beta/releases.json + +BLANK=`awk '! NF { print NR; exit }' changelog.txt` + +I2P-jpackage-windows-$(I2P_VERSION).zip: + zip I2P-jpackage-windows-$(I2P_VERSION).zip I2P + +changelog: + head -n "$(BLANK)" changelog.txt + +release-jpackage: I2P-jpackage-windows-$(I2P_VERSION).zip + head -n "$(BLANK)" changelog.txt | gothub release -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true + +update-release-jpackage: + head -n "$(BLANK)" changelog.txt | gothub edit -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true + +delete-release-jpackage: + gothub delete -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION); true + +upload-release-jpackage: + gothub upload -R -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n "i2p-jpackage-windows-$(I2P_VERSION)" -f "./I2P-jpackage-windows-$(I2P_VERSION).zip" + +jpackage-release: release-jpackage upload-release-jpackage From de6c0dfd2fb1c455d9e96cdf5e68038b441e3161 Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 6 Nov 2021 13:49:39 -0400 Subject: [PATCH 06/16] Add upload targets for the jpackage zips --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 78f98dd..d0ba85b 100644 --- a/Makefile +++ b/Makefile @@ -309,6 +309,8 @@ releases.json: torrent BLANK=`awk '! NF { print NR; exit }' changelog.txt` +I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip + I2P-jpackage-windows-$(I2P_VERSION).zip: zip I2P-jpackage-windows-$(I2P_VERSION).zip I2P From 4d6c1d4df15cb8af130e2656e510c2abd6225912 Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 6 Nov 2021 13:57:14 -0400 Subject: [PATCH 07/16] zip should be recursive --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d0ba85b..af50a70 100644 --- a/Makefile +++ b/Makefile @@ -312,7 +312,7 @@ BLANK=`awk '! NF { print NR; exit }' changelog.txt` I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip I2P-jpackage-windows-$(I2P_VERSION).zip: - zip I2P-jpackage-windows-$(I2P_VERSION).zip I2P + zip I2P-jpackage-windows-$(I2P_VERSION).zip -r I2P changelog: head -n "$(BLANK)" changelog.txt From d53974d5b91df74380bd46737799ed9984481f02 Mon Sep 17 00:00:00 2001 From: idk Date: Sat, 6 Nov 2021 15:49:28 -0400 Subject: [PATCH 08/16] bump NSIS build to 1.05.1 --- src/nsis/i2pbrowser-version.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nsis/i2pbrowser-version.nsi b/src/nsis/i2pbrowser-version.nsi index 6bd9046..7ab02aa 100644 --- a/src/nsis/i2pbrowser-version.nsi +++ b/src/nsis/i2pbrowser-version.nsi @@ -1,3 +1,3 @@ !define VERSIONMAJOR 1 !define VERSIONMINOR 05 -!define VERSIONBUILD 0 +!define VERSIONBUILD 1 From 3125f13138d80420c42622d837d517403537735a Mon Sep 17 00:00:00 2001 From: idk Date: Sun, 7 Nov 2021 15:14:07 -0500 Subject: [PATCH 09/16] Sign with my Router News keys instead of my plugin keys --- .gitignore | 3 ++- Makefile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index daa2630..13c15f0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ build i2pversion_override *.crl *.crt -*.pem \ No newline at end of file +*.pem +*.p12 diff --git a/Makefile b/Makefile index af50a70..0730632 100644 --- a/Makefile +++ b/Makefile @@ -263,6 +263,7 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools: su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)" + java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE i2pbrowser.zip I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER) docker: docker build -t geti2p/i2p.firefox . From a96d33027c5da778485c97eddb8f5d60fd70f8ee Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 7 Dec 2021 14:40:43 -0500 Subject: [PATCH 10/16] Update router version --- HTTPSEverywhere.url | 1 - NoScript.url | 1 - i2psetproxy.url | 1 - i2pversion | 6 +++--- src/app-profile/version.txt | 2 +- src/nsis/i2pbrowser-jpackage.nsi | 2 +- src/nsis/i2pbrowser-version.nsi | 4 ++-- src/profile/version.txt | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 HTTPSEverywhere.url delete mode 100644 NoScript.url delete mode 100644 i2psetproxy.url diff --git a/HTTPSEverywhere.url b/HTTPSEverywhere.url deleted file mode 100644 index 84202f4..0000000 --- a/HTTPSEverywhere.url +++ /dev/null @@ -1 +0,0 @@ -https://addons.mozilla.org/firefox/downloads/file/3809748/2021.7.13/https-everywhere-eff@eff.org.xpi diff --git a/NoScript.url b/NoScript.url deleted file mode 100644 index 73fb92c..0000000 --- a/NoScript.url +++ /dev/null @@ -1 +0,0 @@ -https://addons.mozilla.org/firefox/downloads/file/3534184/11.2.11/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi diff --git a/i2psetproxy.url b/i2psetproxy.url deleted file mode 100644 index 9e98787..0000000 --- a/i2psetproxy.url +++ /dev/null @@ -1 +0,0 @@ -https://addons.mozilla.org/firefox/downloads/file/3821635/0.112.1/i2ppb@eyedeekay.github.io.xpi diff --git a/i2pversion b/i2pversion index bfdb7ee..a721b68 100644 --- a/i2pversion +++ b/i2pversion @@ -3,9 +3,9 @@ #Comment this out to build from an alternate branch or # the tip of the master branch. -I2P_VERSION=1.5.1 -export I2P_VERSION=1.5.1 -VERSION=i2p-jpackage-"$I2P_VERSION" +I2P_VERSION=1.6.1 +export I2P_VERSION=1.6.1 +VERSION=i2p-"$I2P_VERSION" export VERSION="$VERSION" #Uncomment this to build from the tip of the master. diff --git a/src/app-profile/version.txt b/src/app-profile/version.txt index 0a928bc..daa5381 100644 --- a/src/app-profile/version.txt +++ b/src/app-profile/version.txt @@ -1 +1 @@ -1.05.0 +1.05.1 diff --git a/src/nsis/i2pbrowser-jpackage.nsi b/src/nsis/i2pbrowser-jpackage.nsi index c5c464a..5742586 100644 --- a/src/nsis/i2pbrowser-jpackage.nsi +++ b/src/nsis/i2pbrowser-jpackage.nsi @@ -1 +1 @@ -!define I2P_VERSION 0.9.50 \ No newline at end of file +!define I2P_VERSION 1.6.1 \ No newline at end of file diff --git a/src/nsis/i2pbrowser-version.nsi b/src/nsis/i2pbrowser-version.nsi index 7ab02aa..5d84799 100644 --- a/src/nsis/i2pbrowser-version.nsi +++ b/src/nsis/i2pbrowser-version.nsi @@ -1,3 +1,3 @@ !define VERSIONMAJOR 1 -!define VERSIONMINOR 05 -!define VERSIONBUILD 1 +!define VERSIONMINOR 06 +!define VERSIONBUILD 0 diff --git a/src/profile/version.txt b/src/profile/version.txt index 0a928bc..daa5381 100644 --- a/src/profile/version.txt +++ b/src/profile/version.txt @@ -1 +1 @@ -1.05.0 +1.05.1 From 57a8f6a1a00c63602e106313bc189a54e8860e47 Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 7 Dec 2021 22:25:42 -0500 Subject: [PATCH 11/16] Fix bug, bump version --- src/app-profile/version.txt | 2 +- src/nsis/i2pbrowser-version.nsi | 2 +- src/profile/version.txt | 2 +- src/win/i2pbrowser-private.bat | 4 ++-- src/win/i2pbrowser.bat | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app-profile/version.txt b/src/app-profile/version.txt index daa5381..1c06371 100644 --- a/src/app-profile/version.txt +++ b/src/app-profile/version.txt @@ -1 +1 @@ -1.05.1 +1.06.0 diff --git a/src/nsis/i2pbrowser-version.nsi b/src/nsis/i2pbrowser-version.nsi index 5d84799..ee60787 100644 --- a/src/nsis/i2pbrowser-version.nsi +++ b/src/nsis/i2pbrowser-version.nsi @@ -1,3 +1,3 @@ !define VERSIONMAJOR 1 !define VERSIONMINOR 06 -!define VERSIONBUILD 0 +!define VERSIONBUILD 1 diff --git a/src/profile/version.txt b/src/profile/version.txt index daa5381..1c06371 100644 --- a/src/profile/version.txt +++ b/src/profile/version.txt @@ -1 +1 @@ -1.05.1 +1.06.0 diff --git a/src/win/i2pbrowser-private.bat b/src/win/i2pbrowser-private.bat index 8f927e9..3065549 100644 --- a/src/win/i2pbrowser-private.bat +++ b/src/win/i2pbrowser-private.bat @@ -4,9 +4,9 @@ if exist "%ProgramFiles%\I2P\" ( set "I2PPath=%ProgramFiles%\I2P\" ) -if exist "%ProgramFiles(x86)%\I2P" { +if exist "%ProgramFiles(x86)%\I2P" ( set "I2PPath=%ProgramFiles(x86)%\I2P" -} +) if exist "%ProgramFiles%\I2P\jpackaged" ( start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe" diff --git a/src/win/i2pbrowser.bat b/src/win/i2pbrowser.bat index a7f1a02..5d39cda 100644 --- a/src/win/i2pbrowser.bat +++ b/src/win/i2pbrowser.bat @@ -4,9 +4,9 @@ if exist "%ProgramFiles%\I2P\" ( set "I2PPath=%ProgramFiles%\I2P\" ) -if exist "%ProgramFiles(x86)%\I2P" { +if exist "%ProgramFiles(x86)%\I2P" ( set "I2PPath=%ProgramFiles(x86)%\I2P" -} +) if exist "%ProgramFiles%\I2P\jpackaged" ( start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe" From 82104baa5af74da613fea9d4c55add36de93d788 Mon Sep 17 00:00:00 2001 From: idk Date: Wed, 8 Dec 2021 10:33:08 -0500 Subject: [PATCH 12/16] set probable default path before checking list of paths in windows bat file --- src/app-profile/version.txt | 2 +- src/profile/version.txt | 2 +- src/win/i2pbrowser-private.bat | 1 + src/win/i2pbrowser.bat | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app-profile/version.txt b/src/app-profile/version.txt index 1c06371..1c5c4af 100644 --- a/src/app-profile/version.txt +++ b/src/app-profile/version.txt @@ -1 +1 @@ -1.06.0 +1.06.1 diff --git a/src/profile/version.txt b/src/profile/version.txt index 1c06371..1c5c4af 100644 --- a/src/profile/version.txt +++ b/src/profile/version.txt @@ -1 +1 @@ -1.06.0 +1.06.1 diff --git a/src/win/i2pbrowser-private.bat b/src/win/i2pbrowser-private.bat index 3065549..d37a3fd 100644 --- a/src/win/i2pbrowser-private.bat +++ b/src/win/i2pbrowser-private.bat @@ -1,5 +1,6 @@ @echo on +set "I2PPath=%ProgramFiles%\I2P\" if exist "%ProgramFiles%\I2P\" ( set "I2PPath=%ProgramFiles%\I2P\" ) diff --git a/src/win/i2pbrowser.bat b/src/win/i2pbrowser.bat index 5d39cda..3156c57 100644 --- a/src/win/i2pbrowser.bat +++ b/src/win/i2pbrowser.bat @@ -1,5 +1,6 @@ @echo on +set "I2PPath=%ProgramFiles%\I2P\" if exist "%ProgramFiles%\I2P\" ( set "I2PPath=%ProgramFiles%\I2P\" ) From 22e22c8175a0bee4bb4f86fcbbf8b7d48610fcf5 Mon Sep 17 00:00:00 2001 From: idk Date: Wed, 8 Dec 2021 23:07:12 -0500 Subject: [PATCH 13/16] fix torrent generator targets --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0730632..40850d0 100644 --- a/Makefile +++ b/Makefile @@ -281,12 +281,12 @@ run: docker xhost I2P_DATE=`date +%Y-%m-%d` prepupdate: - cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe" i2pwinupdate.su3 + cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3 i2pwinupdate.su3.torrent: prepupdate mktorrent --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3 -torrent: i2pwinupdate.su3 +torrent: i2pwinupdate.su3.torrent MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g'` From 7ce35e0010666ccf84abb6ab6c288e02ebe03cc8 Mon Sep 17 00:00:00 2001 From: idk Date: Thu, 9 Dec 2021 21:54:43 -0500 Subject: [PATCH 14/16] fix issue in torrent generation line --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40850d0..00774cf 100644 --- a/Makefile +++ b/Makefile @@ -263,7 +263,7 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools: su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)" - java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE i2pbrowser.zip I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER) + java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER) docker: docker build -t geti2p/i2p.firefox . From ef45bf3944f49727932e3644a67559e25c3829e0 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 20 Dec 2021 13:52:38 -0500 Subject: [PATCH 15/16] Un-escape the URL which comes escaped from bttools(TODO: fix issue in bttools). --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 00774cf..38bcfbf 100644 --- a/Makefile +++ b/Makefile @@ -284,11 +284,11 @@ prepupdate: cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3 i2pwinupdate.su3.torrent: prepupdate - mktorrent --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3 + mktorrent --announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3 torrent: i2pwinupdate.su3.torrent -MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g'` +MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'` releases.json: torrent @echo "[" | tee ../i2p.newsxml/data/win/beta/releases.json From e1e84bf0ea8d3cbc1ad89058816f5e2d713ebd73 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 20 Dec 2021 16:17:03 -0500 Subject: [PATCH 16/16] Un-escape the URL which comes escaped from bttools(TODO: fix issue in bttools). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 38bcfbf..b8ddda3 100644 --- a/Makefile +++ b/Makefile @@ -284,7 +284,7 @@ prepupdate: cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3 i2pwinupdate.su3.torrent: prepupdate - mktorrent --announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3 + mktorrent --announce=http://tracker2.postman.i2p/announce.php --announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3 torrent: i2pwinupdate.su3.torrent