Merge branch 'master' into 'auto-configure-any-browser'

# Conflicts:
#   src/nsis/i2pbrowser-installer.nsi
This commit is contained in:
idk
2022-09-02 02:49:56 +00:00
3 changed files with 24 additions and 4 deletions

17
experimental.sh Executable file
View File

@ -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

View File

@ -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

View File

@ -145,10 +145,13 @@ 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 /a /r "I2P\"
File /nonfatal /a /r "I2P\I2P.exe"
File "I2P\config\jpackaged"
File /nonfatal /a /r "I2P\I2P.exe"
File /nonfatal "I2P\config\jpackaged"
createDirectory "$I2PINSTEXE\"
SetOutPath "$I2PINSTEXE\"