Backporting to beta (#3344)

* Disarm the HF and add more bootnodes (#3323)

* Disarm the HF

* More bootnodes

* Updated tests

* Windows app and installer fixes (#3338)

* Windows app and installer fixes

* Sorted out comments


Former-commit-id: f64a70feb8594ab4c9494a56702b8283c06a0d19
This commit is contained in:
Arkadiy Paronyan
2016-11-10 15:17:18 +01:00
committed by GitHub
parent 623fc569c2
commit 75166bd0e0
4 changed files with 50 additions and 15 deletions

View File

@@ -12,7 +12,7 @@
!define VERSIONMINOR 4
!define VERSIONBUILD 2
!define ARGS "--warp"
!define FIRST_START_ARGS "--warp --mode=passive"
!define FIRST_START_ARGS "ui --warp --mode=passive"
!addplugindir .\
@@ -160,6 +160,9 @@ section "uninstall"
!insertmacro TerminateApp
# Remove Start Menu launcher
delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk"
delete "$SMPROGRAMS\${COMPANYNAME}\${APPNAME} Ethereum.lnk"
delete "$DESKTOP\${APPNAME} Ethereum.lnk"
# Try to remove the Start Menu folder - this will only happen if it is empty
rmDir "$SMPROGRAMS\${COMPANYNAME}"