From eb38f48c67bbb0fbcf4b912537c49d01fd0ca5e2 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Thu, 16 Dec 2021 19:52:15 -0500 Subject: [PATCH 1/2] first pass at uninstaller --- windows/nsis/cwtch-installer.nsi | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/windows/nsis/cwtch-installer.nsi b/windows/nsis/cwtch-installer.nsi index 75a59515..20c39414 100644 --- a/windows/nsis/cwtch-installer.nsi +++ b/windows/nsis/cwtch-installer.nsi @@ -65,6 +65,11 @@ ShowInstDetails show !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + ; Languages -------------------------------- !insertmacro MUI_LANGUAGE "English" @@ -81,12 +86,18 @@ Section FILE /r "..\..\build\windows\runner\Release\" #FILESLISTEND + CreateDirectory "$SMPROGRAMS\Cwtch" # create a shortcut in the start menu programs directory - CreateDirectory "$SMPROGRAMS\Cwtch" CreateShortcut "$SMPROGRAMS\Cwtch\Cwtch.lnk" "$INSTDIR\cwtch.exe" "" "$INSTDIR\cwtch.ico" ;Store installation folder WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR SectionEnd + +Section "Uninstall" + RMDir "$INSTDIR" /r /REBOOTOK + + DeleteRegKey /ifempty HKCU "Software\Cwtch\installLocation" +SectionEnd \ No newline at end of file From 4946b6c51a829d8632dec78c2e92afead97464fa Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sat, 18 Dec 2021 11:51:44 -0500 Subject: [PATCH 2/2] fix nsis syntax; write uninstaller --- windows/nsis/cwtch-installer.nsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/windows/nsis/cwtch-installer.nsi b/windows/nsis/cwtch-installer.nsi index 20c39414..a63ee737 100644 --- a/windows/nsis/cwtch-installer.nsi +++ b/windows/nsis/cwtch-installer.nsi @@ -94,10 +94,12 @@ Section ;Store installation folder WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR + WriteUninstaller "$INSTDIR\uninstall.exe" + SectionEnd Section "Uninstall" - RMDir "$INSTDIR" /r /REBOOTOK + RMDir /r /REBOOTOK "$INSTDIR" DeleteRegKey /ifempty HKCU "Software\Cwtch\installLocation" SectionEnd \ No newline at end of file