AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop AWG/WG service after uninstall (#738)

Browse source 
* Stop AWG service after uninstall
* Close Amnezia-service executable after install
* Close Amnezia application with service
This commit is contained in:
Mykola Baibuz 2024-04-14 14:08:14 +01:00 • committed by GitHub
parent 030b0351a2
commit f588fe29db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
deploy/data/windows/x32/post_install.cmd Normal file
View file

@ -0,0 +1,5 @@
sc stop WireGuardTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
exit /b 0

5
deploy/data/windows/x32/post_uninstall.cmd
View file

@ -5,3 +5,8 @@ echo %AmneziaPath%
timeout /t 1 timeout /t 1
sc stop AmneziaVPN-service sc stop AmneziaVPN-service
sc delete AmneziaVPN-service sc delete AmneziaVPN-service
sc stop WireGuardTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
exit /b 0

5
deploy/data/windows/x64/post_install.cmd Normal file
View file

@ -0,0 +1,5 @@
sc stop WireGuardTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
exit /b 0

5
deploy/data/windows/x64/post_uninstall.cmd
View file

@ -5,3 +5,8 @@ echo %AmneziaPath%
timeout /t 1 timeout /t 1
sc stop AmneziaVPN-service sc stop AmneziaVPN-service
sc delete AmneziaVPN-service sc delete AmneziaVPN-service
sc stop WireGuardTunnel$AmneziaVPN
sc delete WireGuardTunnel$AmneziaVPN
taskkill /IM "AmneziaVPN-service.exe" /F
taskkill /IM "AmneziaVPN.exe" /F
exit /b 0

5
deploy/installer/config/controlscript.js
View file

@ -93,8 +93,9 @@ function checkProcessIsRunning(arg)
{ {
var cmdArgs = ["-c", arg]; var cmdArgs = ["-c", arg];
var result = installer.execute("/bin/bash", cmdArgs); var result = installer.execute("/bin/bash", cmdArgs);
var resultArg1 = Number(result[0]) var lines = result[0].trim().split(/\n+/);
if (resultArg1 >= 3) { var resultArg1 = Number(lines[0])
if (resultArg1 >= 2) {
return true; return true;
} }
return false; return false;

5
deploy/installer/packages/org.amneziavpn.package/meta/componentscript.js
View file

@ -88,8 +88,9 @@ Component.prototype.createOperations = function()
component.addElevatedOperation("Execute", component.addElevatedOperation("Execute",
["sc", "create", serviceName(), "binpath=", pu_path + serviceName() + ".exe", ["sc", "create", serviceName(), "binpath=", pu_path + serviceName() + ".exe",
"start=", "auto", "depend=", "BFE/nsi"], "start=", "auto", "depend=", "BFE/nsi"],
"UNDOEXECUTE", "cmd", "/c", pu_path + "post_uninstall.cmd"); "UNDOEXECUTE", "cmd", "/c", pu_path + "post_uninstall.cmd");
component.addElevatedOperation("Execute", "cmd", "/c", pu_path + "post_install.cmd");
} else if (runningOnMacOS()) { } else if (runningOnMacOS()) {
component.addElevatedOperation("Execute", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "@TargetDir@/post_uninstall.sh"); component.addElevatedOperation("Execute", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "@TargetDir@/post_uninstall.sh");
} else if (runningOnLinux()) { } else if (runningOnLinux()) {