From 9ec4ea8e039b6685ff91030e2e587691d778faf4 Mon Sep 17 00:00:00 2001 From: Givi Khojanashvili Date: Wed, 23 Mar 2022 12:13:57 +0400 Subject: [PATCH] Add UI binary to windows installer (#283) Windows installer has been updated to add systray UI as an installation step additionally to the service installation --- client/installer.nsis | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/client/installer.nsis b/client/installer.nsis index 9064fa9a4..532b4bcf0 100644 --- a/client/installer.nsis +++ b/client/installer.nsis @@ -15,6 +15,13 @@ !define REG_ROOT "HKLM" !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}" !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" + +!define UI_APP_NAME "Wiretrustee UI" +!define UI_APP_EXE "Wiretrustee" + +!define UI_REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${UI_APP_EXE}" +!define UI_UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UI_APP_NAME}" + Unicode True ###################################################################### @@ -77,6 +84,7 @@ Section -MainProgram SetOverwrite ifnewer SetOutPath "$INSTDIR" File /r "..\\dist\\wiretrustee_windows_amd64\\" + File /r "..\\dist\\wiretrustee-ui_windows_amd64\\" SectionEnd @@ -93,6 +101,13 @@ WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_ WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" +WriteRegStr ${REG_ROOT} "${UI_REG_APP_PATH}" "" "$INSTDIR\${UI_APP_EXE}" +WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayName" "${UI_APP_NAME}" +WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "UninstallString" "$INSTDIR\wiretrustee_uninstall.exe" +WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${UI_APP_EXE}" +WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" +WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" + EnVar::SetHKLM EnVar::AddValueEx "path" "$INSTDIR" @@ -116,4 +131,4 @@ DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}" DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}" EnVar::SetHKLM EnVar::DeleteValue "path" "$INSTDIR" -SectionEnd \ No newline at end of file +SectionEnd