From e8fcb116b282acfeff6493418ad0864104b93499 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Tue, 2 Jul 2019 16:59:50 -0400 Subject: [PATCH] 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 --- CMakeLists.txt | 3 ++- appveyor.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5955aa1..4073e227 100644 --- 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 "info@nano.org") diff --git a/appveyor.yml b/appveyor.yml index cafe6d00..57533a93 100644 --- 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%