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

Ylianst · Oct 24, 2022 · b420da5 · b420da5
2 parents e440d38 + d07ca17
commit b420da5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/agents/meshcore.js b/agents/meshcore.js
@@ -56,7 +56,8 @@ function __readdirSync_fix(path)
     var sysnative = false;
     pathstr = require('fs')._fixwinpath(path);
     if (pathstr.split('\\*').join('').toLowerCase() == process.env['windir'].toLowerCase()) { sysnative = true; }
-    var ret = __readdirSync_old(path);
+
+    var ret = require('fs').__readdirSync_old(path);
     if (sysnative) { ret.push('sysnative'); }
     return (ret);
 }

diff --git a/agents/meshinstall-linux.js b/agents/meshinstall-linux.js
@@ -222,21 +222,19 @@ if ((!skip) && ((msh.InstallFlags & 2) == 2))
 
     if (!skip)
     {
-        if (process.platform != 'darwin')
+        if (process.argv.includes('-install') || process.argv.includes('-update'))
         {
-            if (process.argv.includes('-install') || process.argv.includes('-update'))
+            var p = [];
+            for (var i = 0; i < process.argv.length; ++i)
             {
-                var p = [];
-                for (var i = 0; i < process.argv.length; ++i)
+                if (process.argv[i].startsWith('--installPath='))
                 {
-                    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]);
-                    }
+                    p.push('--installPath="' + process.argv[i].split('=').pop() + '"');
+                }
+                else if(process.argv[i].startsWith('--'))
+                {
+                    p.push(process.argv[i]);
+                }
             }
             _install(p);
             process.exit();
@@ -274,12 +272,11 @@ if ((!skip) && ((msh.InstallFlags & 2) == 2))
                 process.exit();
             }
         }
+        if (process.platform == 'darwin')
+        {
+            if (!require('user-sessions').isRoot()) { console.log('\n' + translation[lang].elevation); process.exit(); }
+        }
     }
-    else
-    {
-        if (!require('user-sessions').isRoot()) { console.log('\n' + translation[lang].elevation); process.exit(); }
-    }
-}
 
 
 if (!skip)