Merge branch 'dev' into fix/uninstall-split-tunnelling-driver

Revert "chore: simplify solution"
This reverts commit 2992a1ec5e.
2026-06-02 08:33:38 +02:00 · 2026-03-23 18:35:34 +04:00 · 2026-03-23 18:34:28 +04:00 · 2026-03-16 18:05:03 +04:00 · 2026-03-16 15:46:58 +04:00 · 2026-02-16 15:58:38 +04:00
2 changed files with 54 additions and 14 deletions
@@ -9,13 +9,12 @@ set "SYS_APP_DIR=%ProgramData%\AmneziaVPN"
 set "SYS_LOG_DIR=%SYS_APP_DIR%\log"
 set "SYS_LOG_FILE=%SYS_LOG_DIR%\AmneziaVPN-service.log"

-timeout /t 1
-sc stop AmneziaVPN-service
-sc delete AmneziaVPN-service
-sc stop AmneziaWGTunnel$AmneziaVPN
-sc delete AmneziaWGTunnel$AmneziaVPN
-taskkill /IM "AmneziaVPN-service.exe" /F
-taskkill /IM "AmneziaVPN.exe" /F
+timeout /t 1 >nul
+call :stop_and_delete_service "AmneziaVPN-service"
+call :stop_and_delete_service "AmneziaWGTunnel$AmneziaVPN"
+taskkill /IM "AmneziaVPN-service.exe" /F >nul 2>&1
+taskkill /IM "AmneziaVPN.exe" /F >nul 2>&1
+call :remove_split_tunnel_driver

 rem Delete the service log file under ProgramData
 if exist "%SYS_LOG_FILE%" del /F /Q "%SYS_LOG_FILE%"
@@ -30,3 +29,24 @@ rd "%USER_APP_DIR%" 2>nul
 rd "%ORG_DIR%" 2>nul

 exit /b 0
+
+:stop_and_delete_service
+set "SVC_NAME=%~1"
+sc query "%SVC_NAME%" >nul 2>&1 || goto :eof
+
+sc stop "%SVC_NAME%" >nul 2>&1
+for /l %%i in (1,1,15) do (
+    sc query "%SVC_NAME%" | find "STOPPED" >nul 2>&1 && goto :delete_service
+    timeout /t 1 /nobreak >nul
+)
+
+:delete_service
+sc delete "%SVC_NAME%" >nul 2>&1
+goto :eof
+
+:remove_split_tunnel_driver
+sc query "AmneziaVPNSplitTunnel" >nul 2>&1 || goto :eof
+rem Explicit stop may trigger BSOD on some systems; delete safely instead.
+sc config "AmneziaVPNSplitTunnel" start= disabled >nul 2>&1
+sc delete "AmneziaVPNSplitTunnel" >nul 2>&1
+goto :eof
@@ -9,13 +9,12 @@ set "SYS_APP_DIR=%ProgramData%\AmneziaVPN"
 set "SYS_LOG_DIR=%SYS_APP_DIR%\log"
 set "SYS_LOG_FILE=%SYS_LOG_DIR%\AmneziaVPN-service.log"

-timeout /t 1
-sc stop AmneziaVPN-service
-sc delete AmneziaVPN-service
-sc stop AmneziaWGTunnel$AmneziaVPN
-sc delete AmneziaWGTunnel$AmneziaVPN
-taskkill /IM "AmneziaVPN-service.exe" /F
-taskkill /IM "AmneziaVPN.exe" /F
+timeout /t 1 >nul
+call :stop_and_delete_service "AmneziaVPN-service"
+call :stop_and_delete_service "AmneziaWGTunnel$AmneziaVPN"
+taskkill /IM "AmneziaVPN-service.exe" /F >nul 2>&1
+taskkill /IM "AmneziaVPN.exe" /F >nul 2>&1
+call :remove_split_tunnel_driver

 rem Delete the service log file under ProgramData
 if exist "%SYS_LOG_FILE%" del /F /Q "%SYS_LOG_FILE%"
@@ -30,3 +29,24 @@ rd "%USER_APP_DIR%" 2>nul
 rd "%ORG_DIR%" 2>nul

 exit /b 0
+
+:stop_and_delete_service
+set "SVC_NAME=%~1"
+sc query "%SVC_NAME%" >nul 2>&1 || goto :eof
+
+sc stop "%SVC_NAME%" >nul 2>&1
+for /l %%i in (1,1,15) do (
+    sc query "%SVC_NAME%" | find "STOPPED" >nul 2>&1 && goto :delete_service
+    timeout /t 1 /nobreak >nul
+)
+
+:delete_service
+sc delete "%SVC_NAME%" >nul 2>&1
+goto :eof
+
+:remove_split_tunnel_driver
+sc query "AmneziaVPNSplitTunnel" >nul 2>&1 || goto :eof
+rem Explicit stop may trigger BSOD on some systems; delete safely instead.
+sc config "AmneziaVPNSplitTunnel" start= disabled >nul 2>&1
+sc delete "AmneziaVPNSplitTunnel" >nul 2>&1
+goto :eof
Author	SHA1	Message	Date
aiamnezia	07fc662c0d	Merge branch 'dev' into fix/uninstall-split-tunnelling-driver	2026-03-23 18:35:34 +04:00
aiamnezia	11324ecd43	Revert "chore: simplify solution" This reverts commit `2992a1ec5e`.	2026-03-23 18:34:28 +04:00
aiamnezia	2992a1ec5e	chore: simplify solution	2026-03-16 18:05:03 +04:00
aiamnezia	193d3e8f80	Add safe split tunneling driver deletion	2026-03-16 15:46:58 +04:00
Mitternacht822	c91a70b1a2	added stop and delete commands for AmneziaVPNSplitTunnel	2026-02-16 15:58:38 +04:00