fix windows installer path (#2112)

* fix windows installer path and registry keys to prompt for uninstall before installing a new version. Previous versions should be uninstalled first on windows as the default path and registry keys are updated * update artifact name to match
nanocurrency · Jul 3, 2019 · 6a37e9b · 6a37e9b
1 parent 4ea1bec
commit 6a37e9b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -435,9 +435,10 @@ if (NANO_GUI OR RAIBLOCKS_GUI)
 												WriteRegDWORD HKLM 'SYSTEM\\\\CurrentControlSet\\\\Services\\\\EventLog\\\\Nano\\\\Nano' 'TypesSupported' '0x7'
 												WriteRegStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Services\\\\EventLog\\\\Nano\\\\Nano' 'EventMessageFile' '$INSTDIR\\\\nano_wallet.exe'")
 		set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "DeleteRegKey HKLM 'SYSTEM\\\\CurrentControlSet\\\\Services\\\\EventLog\\\\Nano'")
+		set (CPACK_PACKAGE_INSTALL_DIRECTORY "nanocurrency")
 		set (CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/Nano.ico)
 		set (CPACK_NSIS_DISPLAY_NAME "Nano")
-		set (CPACK_PACKAGE_NAME "Nano_Installer")
+		set (CPACK_PACKAGE_NAME "nano-node")
 		set (CPACK_NSIS_PACKAGE_NAME "Nano")
 		set (CPACK_NSIS_URL_INFO_ABOUT "https://nano.org")
 		set (CPACK_NSIS_CONTACT "[email protected]")

diff --git a/appveyor.yml b/appveyor.yml
@@ -41,5 +41,5 @@ after_build:
 artifacts:
 - path: nano*.zip
   name: nano_release_%network%
-- path: Nano_Installer-*.exe
-  name: Nano_Installer_%network%
+- path: nano-node-*.exe
+  name: nano-node-%network%