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

fixed path to maintenancetool in linux

Browse source 
- added x11 to runningOnLinux() function
This commit is contained in:
vladimir.kuznetsov 2023-01-22 08:24:45 +03:00
parent c7fb7e58cf
commit eb66354c76
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ function appInstalled()
} else if (runningOnMacOS()){ } else if (runningOnMacOS()){
appInstalledUninstallerPath = "/Applications/" + appName() + ".app/maintenancetool.app/Contents/MacOS/maintenancetool"; appInstalledUninstallerPath = "/Applications/" + appName() + ".app/maintenancetool.app/Contents/MacOS/maintenancetool";
} else if (runningOnLinux()){ } else if (runningOnLinux()){
appInstalledUninstallerPath = "/opt/" + appName(); appInstalledUninstallerPath = "/opt/" + appName() + "/maintenancetool";
} }
return installer.fileExists(appInstalledUninstallerPath) || installer.fileExists(appInstalledUninstallerPath_x86); return installer.fileExists(appInstalledUninstallerPath) || installer.fileExists(appInstalledUninstallerPath_x86);
@ -49,7 +49,7 @@ function runningOnMacOS()
function runningOnLinux() function runningOnLinux()
{ {
return (installer.value("os") === "linux"); return ((installer.value("os") === "linux") || (installer.value("os") === "x11"));
} }
function sleep(miliseconds) { function sleep(miliseconds) {

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

@ -93,7 +93,7 @@ Component.prototype.createOperations = function()
} 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()) {
component.addElevatedOperation("Execute", "bash", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "bash", "@TargetDir@/post_uninstall.sh"); component.addElevatedOperation("Execute", "bash", "@TargetDir@/post_install.sh", "UNDOEXECUTE", "bash", "@TargetDir@/post_uninstall.sh");
} }
} }