diff options
| author | Odd Stranne <odd@mullvad.net> | 2021-03-17 16:32:35 +0100 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2021-07-02 16:31:31 +0200 |
| commit | cb5330bbeef83931310111fad630f64207932f25 (patch) | |
| tree | 64b161eaca2c6e91119232b7ef626f812552474e | |
| parent | 15be4405fcbe845f806d0e2a50c4e948e049d0d5 (diff) | |
| download | mullvadvpn-cb5330bbeef83931310111fad630f64207932f25.tar.xz mullvadvpn-cb5330bbeef83931310111fad630f64207932f25.zip | |
Adjust NSIS code to work with updated driverlogic
| -rw-r--r-- | dist-assets/windows/installer.nsh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/dist-assets/windows/installer.nsh b/dist-assets/windows/installer.nsh index 8ed028c461..0aa6abcbdd 100644 --- a/dist-assets/windows/installer.nsh +++ b/dist-assets/windows/installer.nsh @@ -57,7 +57,6 @@ !define BLOCK_OUTBOUND_IPV4_FILTER_GUID "{a81c5411-0fd0-43a9-a9be-313f299de64f}" !define PERSISTENT_BLOCK_OUTBOUND_IPV4_FILTER_GUID "{79860c64-9a5e-48a3-b5f3-d64b41659aa5}" -!define WINTUN_ADAPTER_GUID "{AFE43773-E1F8-4EBB-8536-576AB86AFE9A}" # # ExtractWintun @@ -197,7 +196,7 @@ log::Log "RemoveWintun()" - nsExec::ExecToStack '"$TEMP\driverlogic.exe" wintun delete-pool-driver ${WINTUN_POOL}' + nsExec::ExecToStack '"$TEMP\driverlogic.exe" wintun-delete-pool-driver ${WINTUN_POOL}' Pop $0 Pop $1 @@ -233,12 +232,11 @@ log::Log "RemoveAbandonedWintunAdapter()" - nsExec::ExecToStack '"$TEMP\driverlogic.exe" remove-device-by-guid ${WINTUN_ADAPTER_GUID}' + nsExec::ExecToStack '"$TEMP\driverlogic.exe" wintun-delete-abandoned-device' Pop $0 Pop $1 ${If} $0 != ${DL_GENERAL_SUCCESS} - ${AndIf} $0 != ${DL_ADAPTER_NOT_FOUND} IntFmt $0 "0x%X" $0 StrCpy $R0 "Failed to remove network adapter: error $0" log::LogWithDetails $R0 $1 |