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.
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.
Bryan Roe committed
Sep 1, 2022 at 11:03 UTC
e704614320feb0448a8933ef46b461e656cd3cef
1 file changed
+14
-10
agents/meshinstall-linux.js
+14
-10
@@ -156,7 +156,7 @@ if (process.argv.includes('-translations'))
156
console.log(JSON.stringify(translation));
157
process.exit();
158
}
159
-if (process.argv.includes('-help'))
159
+if (process.argv.includes('-help') || (process.platform == 'linux' && process.env['XAUTHORITY']==null && process.env['DISPLAY'] == null))
160
{
161
console.log("\n" + translation[lang].commands + ": ");
162
if ((msh.InstallFlags & 1) == 1)
@@ -221,19 +221,23 @@ if ((!skip) && ((msh.InstallFlags & 2) == 2))
221
}
222
}
223
224
-if (!skip)
225
-{
226
- if (process.platform != 'darwin')
224
+ if (!skip)
225
{
228
- if (process.argv.includes('-install') || process.argv.includes('-update'))
226
+ if (process.platform != 'darwin')
227
{
230
- var p = [];
231
- for (var i = 0; i < process.argv.length; ++i)
228
+ if (process.argv.includes('-install') || process.argv.includes('-update'))
229
{
233
- if (process.argv[i].startsWith('--installPath='))
230
+ var p = [];
231
+ for (var i = 0; i < process.argv.length; ++i)
232
{
235
- p.push('--installPath="' + process.argv[i].split('=').pop() + '"');
236
- }
233
+ if (process.argv[i].startsWith('--installPath='))
234
+ {
235
+ p.push('--installPath="' + process.argv[i].split('=').pop() + '"');
236
+ }
237
+ else if(process.argv[i].startsWith('--'))
238
+ {
239
+ p.push(process.argv[i]);
240
+ }
241
}
242
_install(p);
243
process.exit();