diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-06-14 18:53:55 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-06-14 18:53:55 +0000 |
commit | 7931a2baf60a62d5e41f36008d232e3ccf48c951 (patch) | |
tree | 89eb8fbdfa313aef55dbc7a1bf4c35578a1af3ff /packaging/nsis/uninstall.nsi | |
parent | 17da1623564f0b5d6bbb1b2c5a3e73fefcd0ecd4 (diff) |
More NSIS cleanup.
svn path=/trunk/; revision=43261
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
-rwxr-xr-x | packaging/nsis/uninstall.nsi | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index b2366787c7..5f7f9fd2e8 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -6,21 +6,30 @@ ; Create an installer that only writes an uninstaller. ; http://nsis.sourceforge.net/Signing_an_Uninstaller +!include "common.nsh" +!include 'LogicLib.nsh' + SetCompress off -OutFile "..\..\wireshark-gtk2\uninstall_installer.exe" +OutFile "${STAGING_DIR}\uninstall_installer.exe" RequestExecutionLevel user InstType "un.Default (keep Personal Settings and WinPcap)" InstType "un.All (remove all)" -!include "common.nsh" -!include 'LogicLib.nsh' - ; Uninstaller icon UninstallIcon "..\..\image\wiresharkinst.ico" !include "MUI.nsh" +!define MUI_UNICON "..\..\image\wiresharkinst.ico" + +; Uninstall stuff (NSIS 2.08: "\r\n" don't work here) +!define MUI_UNCONFIRMPAGE_TEXT_TOP "The following Wireshark installation will be removed. Click 'Next' to continue." +; Uninstall stuff (this text isn't used with the MODERN_UI!) +;UninstallText "This will uninstall Wireshark.\r\nBefore starting the uninstallation, make sure Wireshark is not running.\r\nClick 'Next' to continue." + +!define MUI_UNFINISHPAGE_NOAUTOCLOSE + !insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_COMPONENTS @@ -44,7 +53,7 @@ ShowUninstDetails show ; ============================================================================ Function .onInit - WriteUninstaller "${MAKEDIR}\..\..\wireshark-gtk2\uninstall.exe" + WriteUninstaller "${STAGING_DIR}\${UNINSTALLER_NAME}" SetErrorLevel 0 Quit FunctionEnd |