I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Actions 5 Packages Projects Releases Wiki Activity

copy resources from sibling branch for jpackaged router experiment

Browse Source
This commit is contained in:
idk
2021-03-26 00:52:45 -04:00
parent 3cdc0d674a
commit 50ab03e195
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -6,8 +6,20 @@ install.exe: profile build/licenses build/I2P
cp src/icons/*.ico build cp src/icons/*.ico build
cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer" cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer"
export RES_DIR="../i2p.i2p/installer/resources"
export PKG_DIR="../i2p.i2p/pkg-temp"
build/I2P: build/I2P:
rm -rf build/I2P rm -rf build/I2P I2P/config/geoip
cp $(RES_DIR)/clients.config I2P/config/
cp $(RES_DIR)/i2ptunnel.config I2P/config/
cp $(RES_DIR)/wrapper.config I2P/config/
cp $(RES_DIR)/hosts.txt I2P/config/hosts.txt
cp -R $(RES_DIR)/certificates I2P/config/certificates
mkdir -p I2P/config/geoip
cp $(RES_DIR)/GeoLite2-Country.mmdb.gz I2P/config/geoip/GeoLite2-Country.mmdb.gz
cp -R "$(PKG_DIR)"/webapps I2P/config/webapps
cd I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
cp -rv I2P build/I2P cp -rv I2P build/I2P
# #

29
src/nsis/i2pbrowser-installer.nsi
View File

@ -169,6 +169,7 @@ Function .onInit
StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/" StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
${EndIf} ${EndIf}
${EndIf} ${EndIf}
StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
${If} ${FileExists} "${I2PINSTEXE32}" ${If} ${FileExists} "${I2PINSTEXE32}"
StrCpy $I2PINSTEXE "${I2PINSTEXE32}" StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
${EndIf} ${EndIf}
@ -185,9 +186,31 @@ FunctionEnd
Function routerDetect Function routerDetect
${If} ${FileExists} "$I2PINSTEXE" ${If} ${FileExists} "$I2PINSTEXE"
## Abort directory Abort directory
${Else}
createDirectory $I2PINSTEXE
SetOutPath $I2PINSTEXE SetOutPath $I2PINSTEXE
File /a /r "I2P\" File /a /r "I2P\"
createDirectory "$LOCALAPPDATA\I2P\"
SetOutPath "$LOCALAPPDATA\I2P\"
File "I2P\config\clients.config"
File "I2P\config\i2ptunnel.config"
File "I2P\config\wrapper.config"
File "I2P\config\hosts.txt"
createDirectory "$LOCALAPPDATA\I2P\webapps\"
SetOutPath "$LOCALAPPDATA\I2P\webapps\"
File /a /r "I2P\config\webapps\"
createDirectory "$LOCALAPPDATA\I2P\geoip\"
SetOutPath "$LOCALAPPDATA\I2P\geoip\"
File /a /r "I2P\config\geoip\"
createDirectory "$LOCALAPPDATA\I2P\certificates\"
SetOutPath "$LOCALAPPDATA\I2P\certificates\"
File /a /r "I2P\config\certificates\"
${EndIf} ${EndIf}
FunctionEnd FunctionEnd
@ -206,7 +229,7 @@ Section Install
FileWrite $0 "@echo off" FileWrite $0 "@echo off"
FileWriteByte $0 "13" FileWriteByte $0 "13"
FileWriteByte $0 "10" FileWriteByte $0 "10"
FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe start"' FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
FileWriteByte $0 "13" FileWriteByte $0 "13"
FileWriteByte $0 "10" FileWriteByte $0 "10"
FileWriteByte $0 "13" FileWriteByte $0 "13"
@ -223,7 +246,7 @@ Section Install
FileWrite $0 "@echo off" FileWrite $0 "@echo off"
FileWriteByte $0 "13" FileWriteByte $0 "13"
FileWriteByte $0 "10" FileWriteByte $0 "10"
FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe start"' FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
FileWriteByte $0 "13" FileWriteByte $0 "13"
FileWriteByte $0 "10" FileWriteByte $0 "10"
FileWriteByte $0 "13" FileWriteByte $0 "13"