diff options
| author | David Lönnhager <david.l@mullvad.net> | 2019-10-21 13:44:02 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2019-10-25 16:48:05 +0200 |
| commit | 9f782a34fa14da169f89c9881b3455efc859c577 (patch) | |
| tree | c390e26d3e3688c087118d3ec3a23d49a601db11 | |
| parent | 9d283c151c21763727191cd33ec641a43d87a435 (diff) | |
| download | mullvadvpn-9f782a34fa14da169f89c9881b3455efc859c577.tar.xz mullvadvpn-9f782a34fa14da169f89c9881b3455efc859c577.zip | |
Run uninstaller for Wintun
| -rw-r--r-- | dist-assets/windows/installer.nsh | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 4ef535f5d6..56cb1269ba 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -387,6 +387,35 @@ !define InstallDriver '!insertmacro "InstallDriver"' # +# RemoveWintun +# +# Try to remove Wintun +# +!macro RemoveWintun + Push $0 + + log::Log "RemoveWintun()" + + ${DisableX64FSRedirection} + ExecWait '"$SYSDIR\msiexec.exe" /x "$TEMP\mullvad-wintun-amd64.msi" /qn /norestart' $0 + ${EnableX64FSRedirection} + + ${If} $0 != 0 + log::Log "Failed to remove Wintun: error $0" + Goto RemoveWintun_return_only + ${EndIf} + + log::Log "RemoveWintun() completed successfully" + + RemoveWintun_return_only: + + Pop $0 + +!macroend + +!define RemoveWintun '!insertmacro "RemoveWintun"' + +# # InstallWintun # # Install Wintun driver @@ -810,6 +839,10 @@ # If not ran silently ${If} $FullUninstall == 1 + # Remove Wintun + ${ExtractWintun} + ${RemoveWintun} + # Remove the TAP adapter ${ExtractDriver} ${RemoveTap} |