From 21b396e34391d5882ce969da6ef54f9ec329b2a6 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 29 Aug 2022 19:56:13 -0400 Subject: [PATCH 1/2] add buildscript for experimental extension loadout --- experimental.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 experimental.sh diff --git a/experimental.sh b/experimental.sh new file mode 100644 index 0000000..4f7d260 --- /dev/null +++ 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 \ No newline at end of file From 0ad940638754c1bca392b748942c07995355a840 Mon Sep 17 00:00:00 2001 From: idk Date: Thu, 1 Sep 2022 21:33:32 -0400 Subject: [PATCH 2/2] copy app, runtime individually instead of the parent dir --- experimental.sh | 0 makefiles/new-extensions.mk | 2 +- src/nsis/i2pbrowser-installer.nsi | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) mode change 100644 => 100755 experimental.sh diff --git a/experimental.sh b/experimental.sh old mode 100644 new mode 100755 diff --git a/makefiles/new-extensions.mk b/makefiles/new-extensions.mk index fb2ba4f..a5239a9 100644 --- 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 diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi index 5b19f22..e5ccff3 100644 --- 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"