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

remove some NSIS lines that are now automated by the jpackage.

Browse Source
This commit is contained in:
idk
2022-09-20 11:39:24 -04:00
parent 8b893d1116
commit 4079d6a8b1
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/net/i2p/router/WinLauncher.java
View File

@ -156,7 +156,7 @@ public class WinLauncher extends CopyConfigDir {
if (osName() != "windows")
return;
// If the user installed the Easy bundle before installing the
// regulalr bundle, then they have a config file which contains the
// IzPack installer, then they have a config file which contains the
// wrong update URL. Check for it, and change it back if necessary.
// closes #23
String routerconf = routerConfig();
@ -197,7 +197,7 @@ public class WinLauncher extends CopyConfigDir {
if (updateURL != null) {
if (updateURL.contains("i2pwinupdate.su3")) {
logger.info(
"checked router.updateURL config, containes win/beta in a service install, invalid update type");
"checked router.updateURL config, containes easy-intall update in a service install, invalid update type");
if (i2pRouter.saveConfig("router.updateURL",
ServiceStaticUpdaterString())) {
logger.info("updated routerconsole.browser config " +

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

@ -146,6 +146,8 @@ Function routerDetect
File /a /r "I2P\app\"
SetOutPath $I2PINSTEXE\runtime
File /a /r "I2P\runtime\"
SetOutPath $I2PINSTEXE\config
File /a /r "I2P\config\"
SetOutPath $I2PINSTEXE
File /a /r "I2P\I2P.exe"
# The NSIS Installer uses an ico icon, the jpackage-only ones use png
@ -154,18 +156,6 @@ Function routerDetect
createDirectory "$I2PINSTEXE\"
SetOutPath "$I2PINSTEXE\"
IfFileExists $I2PINSTEXE\router.config +2 0
File /a /r "I2P/config/router.config"
IfFileExists $I2PINSTEXE\clients.config +2 0
File /a /r "I2P/config/clients.config"
IfFileExists $I2PINSTEXE\wrapper.config +2 0
File /a /r "I2P/config/wrapper.config"
IfFileExists $I2PINSTEXE\hosts.txt +2 0
File /a /r "I2P/config/hosts.txt"
IfFileExists $I2PINSTEXE\eepsite +2 0
File /a /r "I2P/config/eepsite"
IfFileExists $I2PINSTEXE\webapps +2 0
File /a /r "I2P/config/webapps"
File /a /r "I2P/config/certificates"
File /a /r "I2P/config/geoip"
File /a /r "I2P/config/i2ptunnel.config"