MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-15 15:53:55 +00:00
Code Issues Releases Wiki Activity

Updated systemd unit to correctly unescape ExecStart

Browse Source
This commit is contained in:
Bryan Roe
2020-11-04 21:49:53 -08:00
parent db154bb044
commit 4eb89313c8
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

11
modules/service-manager.js
View File

@@ -1554,12 +1554,17 @@ function serviceManager()
child.stdout.on('data', function (chunk) { this.str += chunk.toString(); }); child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
if (require('fs').existsSync('/lib/systemd/system/' + this.name + '.service')) if (require('fs').existsSync('/lib/systemd/system/' + this.name + '.service'))
{ {
child.stdin.write("cat /lib/systemd/system/" + this.name + ".service | grep 'ExecStart=' | awk -F= '{ split($2, a, \" \"); print a[1] }'\n\exit\n"); child.stdin.write("cat /lib/systemd/system/" + this.name + ".service | grep 'ExecStart=' | awk -F= '");
} }
else else
{ {
child.stdin.write("cat /usr/lib/systemd/system/" + this.name + ".service | grep 'ExecStart=' | awk -F= '{ split($2, a, \" \"); print a[1] }'\n\exit\n"); child.stdin.write("cat /usr/lib/systemd/system/" + this.name + ".service | grep 'ExecStart=' | awk -F= '");
} }
child.stdin.write('{');
child.stdin.write(' split($2, a, " ");');
child.stdin.write(' sh=sprintf("systemd-escape -u \\"%s\\"",a[1]);');
child.stdin.write(' system(sh);')
child.stdin.write("}'\nexit\n");
child.waitExit(); child.waitExit();
return (child.stdout.str.trim()); return (child.stdout.str.trim());
}; };
@@ -2263,7 +2268,7 @@ function serviceManager()
conf.write('[Unit]\nDescription=' + serviceDescription + '\n'); conf.write('[Unit]\nDescription=' + serviceDescription + '\n');
conf.write('[Service]\n'); conf.write('[Service]\n');
conf.write('WorkingDirectory=' + options.installPath + '\n'); conf.write('WorkingDirectory=' + options.installPath + '\n');
conf.write('ExecStart=' + options.installPath + options.target + ' ' + parameters + '\n'); conf.write('ExecStart=' + options.installPath.split(' ').join('\\x20') + options.target.split(' ').join('\\x20') + ' ' + parameters + '\n');
conf.write('StandardOutput=null\n'); conf.write('StandardOutput=null\n');
if (options.failureRestart == null || options.failureRestart > 0) if (options.failureRestart == null || options.failureRestart > 0)
{ {