MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-03 17:13:16 +00:00
Code Issues Releases Wiki Activity

Updated windows installer, to ignore PowerShell error on install/uninstall

Browse Source
This commit is contained in:
Bryan Roe
2021-04-01 16:59:31 -07:00
parent d45d74a787
commit 2f6756b364
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/agent-installer.js
View File

@@ -543,13 +543,13 @@ function serviceExists(loc, params)
{
// SUCCESS
process.stdout.write(' [DELETED]\n');
uninstallService(this._params);
uninstallService(params);
}, function ()
{
// FAILED
process.stdout.write(' [No Rules Found]\n');
uninstallService(this._params);
}).parentPromise._params = params;
uninstallService(params);
});
}
else
{

32
modules/win-firewall.js
View File

@@ -448,13 +448,21 @@ function removeFirewallRule(options)
}
}
if (require('os').arch() == 'x64')
try
{
ret.child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
if (require('os').arch() == 'x64')
{
ret.child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
}
else
{
ret.child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
}
}
else
catch(f)
{
ret.child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
ret._rej(f.toString());
return (ret);
}
ret.child.ret = ret;
@@ -493,13 +501,21 @@ function addFirewallRule(options)
}
var child;
if (require('os').arch() == 'x64')
try
{
child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
if (require('os').arch() == 'x64')
{
child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
}
else
{
child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
}
}
else
catch(f)
{
child = require('child_process').execFile(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', ['/C "' + command + '"']);
// Unable to call powershell
return (true);
}
child.stdout.str = ''; child.stdout.on('data', function (c) { this.str += c.toString(); });