diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-10-07 23:27:17 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-10-08 04:18:39 +0000 |
| commit | 7d252d4b55e06d577f56f2169a757e81276dba7b (patch) | |
| tree | d1308732241337f459dcc48be54e7db93986ebeb /packaging/nsis/uninstall.nsi | |
| parent | 291bca0056f0f3c6d3bcd232991cec66d79b17f2 (diff) | |
Add USBPcap 1.1.0.0-g794bf26 to Windows installer
Change-Id: Idb88cd41436e49b7a29bd4a8e896c92d8489318d
Reviewed-on: https://code.wireshark.org/review/10868
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index f4b4c4b078..e72e759c66 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -8,6 +8,9 @@ !include "common.nsh" !include 'LogicLib.nsh' +!include x64.nsh +!include "StrFunc.nsh" +${UnStrRep} SetCompress off OutFile "${STAGING_DIR}\uninstall_installer.exe" @@ -86,6 +89,32 @@ SectionEnd !define EXECUTABLE_MARKER "EXECUTABLE_MARKER" Var EXECUTABLE +Section /o "Un.USBPcap" un.SecUSBPcap +;------------------------------------------- +SectionIn 2 +${If} ${RunningX64} + ${DisableX64FSRedirection} + SetRegView 64 +${EndIf} +ReadRegStr $1 HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\USBPcap" "UninstallString" +${If} ${RunningX64} + ${EnableX64FSRedirection} + SetRegView 32 +${EndIf} +${If} $1 != "" + ${UnStrRep} $2 '$1' '\Uninstall.exe' '' + ${UnStrRep} $3 '$2' '"' '' + ExecWait '$1 _?=$3' $0 + DetailPrint "USBPcap uninstaller returned $0" + ${If} $0 == "0" + Delete "$3\Uninstall.exe" + Delete "$INSTDIR\extcap\USBPcapCMD.exe" + ${EndIf} +${EndIf} +ClearErrors +SectionEnd + + Section "Uninstall" un.SecUinstall ;------------------------------------------- ; @@ -332,6 +361,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${un.SecGlobalSettings} "Uninstall global settings like: $INSTDIR\cfilters" !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPersonalSettings} "Uninstall personal settings like your preferences file from your profile: $PROFILE." !insertmacro MUI_DESCRIPTION_TEXT ${un.SecWinPcap} "Call WinPcap's uninstall program." + !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUSBPcap} "Call USBPcap's uninstall program." !insertmacro MUI_UNFUNCTION_DESCRIPTION_END ; |