MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-04-14 08:15:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ylianst/MeshCentral

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2022-09-01 13:31:19 -07:00
commit 3c697d4d6e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
agents/meshinstall-linux.js
View File

@ -156,7 +156,7 @@ if (process.argv.includes('-translations'))
console.log(JSON.stringify(translation)); console.log(JSON.stringify(translation));
process.exit(); process.exit();
} }
if (process.argv.includes('-help')) if (process.argv.includes('-help') || (process.platform == 'linux' && process.env['XAUTHORITY']==null && process.env['DISPLAY'] == null))
{ {
console.log("\n" + translation[lang].commands + ": "); console.log("\n" + translation[lang].commands + ": ");
if ((msh.InstallFlags & 1) == 1) if ((msh.InstallFlags & 1) == 1)
@ -221,19 +221,23 @@ if ((!skip) && ((msh.InstallFlags & 2) == 2))
} }
} }
if (!skip) if (!skip)
{
if (process.platform != 'darwin')
{ {
if (process.argv.includes('-install') || process.argv.includes('-update')) if (process.platform != 'darwin')
{ {
var p = []; if (process.argv.includes('-install') || process.argv.includes('-update'))
for (var i = 0; i < process.argv.length; ++i)
{ {
if (process.argv[i].startsWith('--installPath=')) var p = [];
for (var i = 0; i < process.argv.length; ++i)
{ {
p.push('--installPath="' + process.argv[i].split('=').pop() + '"'); if (process.argv[i].startsWith('--installPath='))
} {
p.push('--installPath="' + process.argv[i].split('=').pop() + '"');
}
else if(process.argv[i].startsWith('--'))
{
p.push(process.argv[i]);
}
} }
_install(p); _install(p);
process.exit(); process.exit();