mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2024-12-25 22:55:52 -05:00
1. Updated so passthru parameters are passed thru installer
2. Updated so if run from SSH/Terminal, text mode will run as default, instead of appearing hung or displaying timeout.
This commit is contained in:
parent
32b194fa50
commit
e704614320
@ -156,7 +156,7 @@ if (process.argv.includes('-translations'))
|
||||
console.log(JSON.stringify(translation));
|
||||
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 + ": ");
|
||||
if ((msh.InstallFlags & 1) == 1)
|
||||
@ -221,19 +221,23 @@ if ((!skip) && ((msh.InstallFlags & 2) == 2))
|
||||
}
|
||||
}
|
||||
|
||||
if (!skip)
|
||||
{
|
||||
if (process.platform != 'darwin')
|
||||
if (!skip)
|
||||
{
|
||||
if (process.argv.includes('-install') || process.argv.includes('-update'))
|
||||
if (process.platform != 'darwin')
|
||||
{
|
||||
var p = [];
|
||||
for (var i = 0; i < process.argv.length; ++i)
|
||||
if (process.argv.includes('-install') || process.argv.includes('-update'))
|
||||
{
|
||||
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);
|
||||
process.exit();
|
||||
|
Loading…
Reference in New Issue
Block a user