Updated all MeshAgents.

agents/hashagents.txt

@@ -1,33 +1,33 @@
 3: MeshService-signed.exe
-15B19C5D60155EBC824E19BC21FA7D20351F368CE5C923D265EAD7F43B1D8854EF0DBBE57AB26493F82E36CB142E0B24
+C04FA82B33290FE52C732165834EA4B5491E6982A2671C0FF51DB447CA50434CC38515AA15D40D20C105CF2C13BA9D02
 4: MeshService64-signed.exe
-402941EA92A70CA80F3A5149162E2D373344001B5389D6CFC3B995A2BD1D9C763099C566615E57029D707F4E757350E7
+45A86F19CCE1BE657A37AA4D2E2F10DED27337EA34FA6195DBAAF9CAF642195FC8059684E20DDC92CDFB56C60C3BD8C3
 5: meshagent_x86
-715186A078EE4AF74C05EE4084BB7BBBE4DEF4F3A24664ED0EA79F2E1B95B160697FD3C538CA519D619BBF2DE5311AB8
+3EA390454CE039823B735D61EEF5A5BC39AD656BE156BC3C3E818DF2BB3F1442CDC0146A222E7C37F14D23CAF070AECE
 6: meshagent_x86-64
-F7117FBA95A0C132C730E1F29B13E281A387A6615AFD295C702271868EFDACAE598EE7167DA7FDCC7112E3B5FD5C9CDF
+64FD1D49A16017F8C86EB0054236427E3AEC3B31BD35EAF8B372ADF451F284142360480B325A2CC203CFA95B069211ED
 9: meshagent_arm
-7AE1AA999B86E5CF67C8F3F5CE9D1E7981FF3F5299B514A21ED460A8B4D3786FD523B68D92D32E0258D449573DB50E0F
+25DDBBB570AA5F0EC1E7CDF10D35299089BB32785CE530139544AF04350390C7029A104DE840E98D719B4B1905ECE749
 7: meshagent_mips
-43616A92F8373984B96E8F71CF9211E29582CFC1E035E5739B65C99CF001F16BA53C3AAB8AD2657AFAA45341C10BD055
+7A9C9E622DAEC35013724A8A92D8BC5D944EA18E530A9E89A7E9B2719D112577B6CF3932560A1B64382E1129BEDE64E7
 13: meshagent_pogo
-4B5918296BCA88DC3654EEFC6AF3E1722A9BE8AA83174925D1B8598D5186A09EFC7003F24A049B7970BCAE1043120621
+1D4B5C066F249B9863A3194C72FD24F279AD7564968106EEE28A850B30AFD9AD04117133802C72E13194B8E4B2DACE41
 15: meshagent_poky
-ABA3EEF6883B7A1F8A2B34B32AF518DFC8319F96B8474E43762DE09B24D7E419D1E738A0A1721BC918848FEC74A9B365
+B040D93B61F95D720A71C69747FFAB879DC786575E6D6E07A66CAE5A773A3DE1CD8D5EED1F616D412695A881C43C1719
 16: meshagent_osx-x86-64
-BD7071C5D2E46275202E802CB149A82948B4597399B64A8A22AED3F2593730D00646F9AA347E53B3F2460E42DB88FB87
+FFB730DA93DBE85C719DE5794522DB482968FEF3B6546312BD65749C5C142A8448BCD79F28FBDAA9FD33514F2EADFF39
 18: meshagent_poky64
-1105DD015C75A86D9DDA7C4C9EBD2E169009578A4FB26E19E0C1B8C522667C065B6C969C3C46BC200CA953912F645CDD
+0F6FE1230143B663BEB8C18450184CF13C12B4865A64083A399003D6B17AAA1F47745BF93380382712D2F7B14D7BFDCE
 19: meshagent_x86_nokvm
-4C0828B4596ED72A542F2240FA78E1FCF39BFA33BB7315E6FB26CB0D6E4DAEF14A49F25C9FCA731AF1BA144BEC3B55DE
+A42ED063D34469B272DB09BA28E8B1E3DAABA4468994CB4E83CF5B625D08D3F6676EBF39A8AE3C2E5EAAC010EEEE79A7
 20: meshagent_x86-64_nokvm
-9BAF098F604903CB81968DF0BBDB3914D5BF1D114DFE08F29E3BC62D2C6D839D65D1A437087C486B51FD4DA18B363D04
+2CB7E07B7522CE54F6791AD923EFA81C93CDADE0F77BAD9EC5DA1FB362ED7DD79FF522CA38DC23242853235903C054F7
 24: meshagent_arm-linaro
-8B953C45BCF20A353192783A55CAAAB12D0F69E6BEB71AC83BA871F3F4465B1C1D5C22C10189399287A69B76ABB19FCD
+D270E2C42B65B20DA8487C63120D3B02CCA916FF35220C4B1623A33D02EC70411A4DB808F97A5159AB4E9985387B3821
 25: meshagent_armhf
-B679432037078A04775DAB5349ACD7FDDC9DED3804DCDB42140EF2E3944B50799218D39C2477CD332E6DA229004AE919
+DCFF6BED2AB4E3290274C7B1D2F5984CC7E4FA3D6E5B063C839E6D1D67648CB74A7324C52C0413C99C37F86EA381E08A
 26: meshagent_arm64
-407922C20CB88C7AD0AA11D72C74F1D359EF98C13F6F5ED307D2DE692E5F7E2C0894C0087AADE19DC54C34E98E629ED3
+CC1E9B31DDB1474A01D145A856E6F0CE52072939D5AB8BF921BF8572AF4F7CF08B59AF8C095CFDC86A1887F225ABD42C
 30: meshagent_freebsd_x86-64
-A5A8784C936B3FA5B2E310382DD369B5820C6D17A80AB8DD99E8109C543AE4B1F2956F8E55CF60BBE480311C1327DC94
+40868E8C42A9E429B79A9D0C572686221A222E3188A09DE8FF730A7538A0A2CE85B71BEA940EAAC9AA3415F1677CCCC0
 

agents/meshinstall-linux.js

@@ -14,12 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-/*
-TODO: in msh, when:
-InstallFlags=1    --> Interactive only, show connect button, not install/uninstal.
-InstallFlags=2    --> Background only, show only install/uninstal, not connect.
-*/
-
 var msh = {};
 var s = null;
 try { s = require('service-manager').manager.getService('meshagent'); } catch (e) { }

translate/translate.json

@@ -1478,7 +1478,10 @@
       "nl": "64bit versie van de MacOS Mesh Agent",
       "pt": "Versão de 64 bits do MacOS Mesh Agent",
       "ru": "64-битная версия MacOS Mesh Agent",
-      "zh-chs": "64位版本的MacOS Mesh Agent",
+      "zh-chs": "64位版本的MacOS Mesh Agent"
+    },
+    {
+      "en": "64bit version of macOS Mesh Agent",
       "xloc": [
         "default.handlebars->27->377"
       ]
@@ -3608,10 +3611,7 @@
       "nl": "Apple MacOS",
       "pt": "Apple MacOS",
       "ru": "Apple MacOS",
-      "zh-chs": "蘋果MacOS",
+      "zh-chs": "蘋果MacOS"
-      "xloc": [
-        "default.handlebars->27->354"
-      ]
     },
     {
       "cs": "pouze Apple MacOS",
@@ -3625,7 +3625,16 @@
       "nl": "Alleen Apple MacOS",
       "pt": "Apenas Apple MacOS ",
       "ru": "Только Apple MacOS",
-      "zh-chs": "僅限Apple MacOS",
+      "zh-chs": "僅限Apple MacOS"
+    },
+    {
+      "en": "Apple macOS",
+      "xloc": [
+        "default.handlebars->27->354"
+      ]
+    },
+    {
+      "en": "Apple macOS only",
       "xloc": [
         "default.handlebars->27->325"
       ]
@@ -6819,10 +6828,7 @@
       "nl": "Kopieer MacOS agent link naar het klembord",
       "pt": "Copiar o URL do agente MacOS para a área de transferência",
       "ru": "Скопировать ссылку MacOS agent в буфер обмена",
-      "zh-chs": "將MacOS代理URL複製到剪貼板",
+      "zh-chs": "將MacOS代理URL複製到剪貼板"
-      "xloc": [
-        "default.handlebars->27->378"
-      ]
     },
     {
       "cs": "Zkopírujte adresu URL agenta Windows 32bit do schránky",
@@ -6910,6 +6916,12 @@
         "default.handlebars->27->348"
       ]
     },
+    {
+      "en": "Copy macOS agent URL to clipboard",
+      "xloc": [
+        "default.handlebars->27->378"
+      ]
+    },
     {
       "cs": "Zkopírovat jméno do schránky",
       "de": "Name in Zwischenablage kopieren",
@@ -15405,7 +15417,7 @@
       "ru": "Linux / BSD",
       "zh-chs": "Linux / BSD",
       "xloc": [
-        "default.handlebars->27->353"
+        "default.handlebars->27->352"
       ]
     },
     {
@@ -15425,6 +15437,12 @@
         "default.handlebars->27->356"
       ]
     },
+    {
+      "en": "Linux / BSD / macOS Binary Installer",
+      "xloc": [
+        "default.handlebars->27->353"
+      ]
+    },
     {
       "cs": "Linux 32bit",
       "de": "Linux 32bit",
@@ -15628,10 +15646,7 @@
     },
     {
       "en": "Linux/macOS Binary Installer",
-      "nl": "Linux/macOS binair installatieprogramma",
+      "nl": "Linux/macOS binair installatieprogramma"
-      "xloc": [
-        "default.handlebars->27->350"
-      ]
     },
     {
       "cs": "Seznam",
@@ -16322,10 +16337,7 @@
       "nl": "MacOS (64bit)",
       "pt": "MacOS (64 bits)",
       "ru": "MacOS (64bit)",
-      "zh-chs": "MacOS（64位）",
+      "zh-chs": "MacOS（64位）"
-      "xloc": [
-        "default.handlebars->27->735"
-      ]
     },
     {
       "cs": "macOS 32bit",
@@ -16341,8 +16353,7 @@
       "ru": "MacOS 32bit",
       "zh-chs": "MacOS 32位",
       "xloc": [
-        "default-mobile.handlebars->9->17",
+        "default-mobile.handlebars->9->17"
-        "default.handlebars->27->24"
       ]
     },
     {
@@ -16359,8 +16370,7 @@
       "ru": "MacOS 64bit",
       "zh-chs": "MacOS 64位",
       "xloc": [
-        "default-mobile.handlebars->9->22",
+        "default-mobile.handlebars->9->22"
-        "default.handlebars->27->29"
       ]
     },
     {
@@ -17255,10 +17265,7 @@
       "nl": "MeshCmd (MacOS, 64bit)",
       "pt": "MeshCmd (MacOS, 64bit)",
       "ru": "MeshCmd (MacOS, 64bit)",
-      "zh-chs": "MeshCmd（MacOS，64位）",
+      "zh-chs": "MeshCmd（MacOS，64位）"
-      "xloc": [
-        "default.handlebars->27->750"
-      ]
     },
     {
       "cs": "MeshCmd (spustitelný soubor Win32)",
@@ -17294,6 +17301,12 @@
         "default.handlebars->27->747"
       ]
     },
+    {
+      "en": "MeshCmd (macOS, 64bit)",
+      "xloc": [
+        "default.handlebars->27->750"
+      ]
+    },
     {
       "cs": "MeshCmd je nástroj příkazového řádku, který provádí mnoho různých operací. Soubor akcí lze volitelně stáhnout a upravit, aby poskytoval informace o serveru a přihlašovací údaje.",
       "de": "MeshCmd ist ein Befehlszeilenprogramm, das viele verschiedene Vorgänge ausführt. Die Aktionsdatei kann optional heruntergeladen und bearbeitet werden, um Serverinformationen und Anmeldeinformationen bereitzustellen.",
@@ -19677,7 +19690,7 @@
       "xloc": [
         "default-mobile.handlebars->9->328",
         "default.handlebars->27->321",
-        "default.handlebars->27->351",
+        "default.handlebars->27->350",
         "default.handlebars->27->560",
         "default.handlebars->27->739",
         "default.handlebars->27->862"
@@ -26358,12 +26371,15 @@
       ]
     },
     {
-      "en": "This is a executable that will only run as root and on OS's with graphical user interfaces.",
+      "en": "This is a executable on OS's with graphical user interfaces. You need to 'chmod +x meshagent' and run this file.",
-      "nl": "Dit is een uitvoerbaar bestand dat alleen zal draaien als root en op besturingssystemen met grafische gebruikersinterfaces.",
       "xloc": [
         "default.handlebars->27->387"
       ]
     },
+    {
+      "en": "This is a executable that will only run as root and on OS's with graphical user interfaces.",
+      "nl": "Dit is een uitvoerbaar bestand dat alleen zal draaien als root en op besturingssystemen met grafische gebruikersinterfaces."
+    },
     {
       "cs": "Toto je portál pro vzdálenou správu a podporu počítače.",
       "de": "Dies ist ein Portal für die Remoteverwaltung und den Support von Computern.",
@@ -29421,7 +29437,7 @@
       "ru": "Windows",
       "zh-chs": "視窗",
       "xloc": [
-        "default.handlebars->27->352"
+        "default.handlebars->27->351"
       ]
     },
     {
@@ -30825,6 +30841,24 @@
         "terms.handlebars->container->column_l->75->1"
       ]
     },
+    {
+      "en": "macOS (64bit)",
+      "xloc": [
+        "default.handlebars->27->735"
+      ]
+    },
+    {
+      "en": "macOS 32bit",
+      "xloc": [
+        "default.handlebars->27->24"
+      ]
+    },
+    {
+      "en": "macOS 64bit",
+      "xloc": [
+        "default.handlebars->27->29"
+      ]
+    },
     {
       "en": "meshagent",
       "cs": "MeshAgenta",

views/default.handlebars

@@ -1204,7 +1204,7 @@
         var autoReconnect = true;
         var powerStatetable = ['', "Powered", "Sleep", "Sleep", "Sleep", "Hibernating", "Power off", "Present"];
         var StatusStrs = ["Disconnected", "Connecting...", "Setup...", "Connected", "Intel® AMT Connected"];
-        var agentsStr = ["Unknown", "Windows 32bit console", "Windows 64bit console", "Windows 32bit service", "Windows 64bit service", "Linux 32bit", "Linux 64bit", "MIPS", "XENx86", "Android ARM", "Linux ARM", "MacOS 32bit", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "MacOS 64bit", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64bit", "Windows MinCore console", "Windows MinCore service", "NodeJS", "ARM-Linaro", "ARMv6l / ARMv7l", "ARMv8 64bit", "ARMv6l / ARMv7l / NoKVM", "Unknown", "Unknown", "FreeBSD x86-64"];
+        var agentsStr = ["Unknown", "Windows 32bit console", "Windows 64bit console", "Windows 32bit service", "Windows 64bit service", "Linux 32bit", "Linux 64bit", "MIPS", "XENx86", "Android ARM", "Linux ARM", "macOS 32bit", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "macOS 64bit", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64bit", "Windows MinCore console", "Windows MinCore service", "NodeJS", "ARM-Linaro", "ARMv6l / ARMv7l", "ARMv8 64bit", "ARMv6l / ARMv7l / NoKVM", "Unknown", "Unknown", "FreeBSD x86-64"];
         var sort = 0;
         var searchFocus = 0;
         var mapSearchFocus = 0;
@@ -4057,7 +4057,7 @@
                 x += '<div id=emailInviteDiv style=display:none>' + format("Invite someone to install the mesh agent. An email with be sent with the link to the mesh agent installation for the \"{0}\" device group.", EscapeHtml(mesh.name)) + '<br /><br />';
                 x += addHtmlValue("Name (optional)", '<input id=agentInviteName value="" style=width:230px maxlength=64 />');
                 x += addHtmlValue("Email", '<input id=agentInviteEmail style=width:230px placeholder="' + "example@email.com" + '" onkeyup=validateAgentInvite()></input>');
-                x += addHtmlValue("Operating System", '<select id=agentInviteNameOs onchange=d2ChangedInviteType() style=width:236px><option value=4>' + "Send installation link" + '</option><option value=0 selected>' + "Any supported" + '</option><option value=1>' + "Windows only" + '</option><option value=3>' + "Apple MacOS only" + '</option><option value=2>' + "Linux only" + '</option></select>');
+                x += addHtmlValue("Operating System", '<select id=agentInviteNameOs onchange=d2ChangedInviteType() style=width:236px><option value=4>' + "Send installation link" + '</option><option value=0 selected>' + "Any supported" + '</option><option value=1>' + "Windows only" + '</option><option value=3>' + "Apple macOS only" + '</option><option value=2>' + "Linux only" + '</option></select>');
                 x += '<div id=d2agentexpirediv>';
                 x += addHtmlValue("Link Expiration", '<select id=agentInviteExpire style=width:236px><option value=1>' + "1 hour" + '</option><option value=8>' + "8 hours" + '</option><option value=24>' + "1 day" + '</option><option value=168>' + "1 week" + '</option><option value=5040>' + "1 month" + '</option><option value=0>' + "Unlimited" + '</option></select>');
                 x += '</div>';
@@ -4106,18 +4106,16 @@
         function addAgentToMesh(meshid) {
             if (xxdialogMode) return false;
             var mesh = meshes[meshid], x = '', installType = 0, moreoptions = '';
-            if (debugmode > 0) { moreoptions = '<option value=5>' + "Linux/macOS Binary Installer" + '</option>'; }
+            x += addHtmlValue("Operating System", '<select id=aginsSelect onchange=addAgentToMeshClick() style=width:236px><option value=0>' + "Windows" + '</option><option value=1>' + "Linux / BSD" + '</option><option value=5>' + "Linux / BSD / macOS Binary Installer" + '</option><option value=2>' + "Apple macOS" + '</option><option value=3>' + "Windows (UnInstall)" + '</option><option value=4>' + "Linux / BSD (UnInstall)" + '</option></select>');
-            x += addHtmlValue("Operating System", '<select id=aginsSelect onchange=addAgentToMeshClick() style=width:236px><option value=0>' + "Windows" + '</option><option value=1>' + "Linux / BSD" + '</option>' + moreoptions + '<option value=2>' + "Apple MacOS" + '</option><option value=3>' + "Windows (UnInstall)" + '</option><option value=4>' + "Linux / BSD (UnInstall)" + '</option></select>');
 
-            if (debugmode > 0) { 
+            // Add Linux/macOS binary installer option
-                var binaryInstallAgents = { 5 : 'Linux x86-32', 6 : 'Linux x86-64', 16 : 'Apple OSX x86-64', 25 : 'Linux ARM-HF, Rasberry Pi', 26 : 'Linux ARM64', 30 : 'FreeBSD x86-64' };
+            var binaryInstallAgents = { 6 : 'Linux x86-64', 5 : 'Linux x86-32', 16 : 'Apple OSX x86-64', 25 : 'Linux ARM-HF, Rasberry Pi', 26 : 'Linux ARM64-HF', 30 : 'FreeBSD x86-64' };
-                moreoptions = '';
+            for (var i in binaryInstallAgents) { moreoptions += '<option value=' + i + '>' + binaryInstallAgents[i] + '</option>' }
-                for (var i in binaryInstallAgents) { moreoptions += '<option value=' + i + '>' + binaryInstallAgents[i] + '</option>' }
+            x += '<div id=aginsSysTypeDiv>';
-                x += '<div id=aginsSysTypeDiv>';
+            x += addHtmlValue("System Type", '<select id=aginsSysType onchange=addAgentToMeshClick() style=width:236px>' + moreoptions + '</select>');
-                x += addHtmlValue("System Type", '<select id=aginsSysType onchange=addAgentToMeshClick() style=width:236px>' + moreoptions + '</select>');
+            x += '</div>';
-                x += '</div>';
-            }
 
+            // Add installation type option
             x += '<div id=aginsTypeDiv>';
             x += addHtmlValue("Installation Type", '<select id=aginsType onchange=addAgentToMeshClick() style=width:236px><option value=0>' + "Background & interactive" + '</option><option value=2>' + "Background only" + '</option><option value=1>' + "Interactive only" + '</option></select>');
             x += '</div><hr>';
@@ -4127,7 +4125,6 @@
             meshfilename = meshfilename.split('\\').join('').split('/').join('').split(':').join('').split('*').join('').split('?').join('').split('"').join('').split('<').join('').split('>').join('').split('|').join('').split(' ').join('').split('\'').join('');
 
             // Windows agent install
-            //x += "<div id=agins_windows>To add a new computer to device group \"" + EscapeHtml(mesh.name) + "\", download the mesh agent and configuration file and install the agent on the computer to manage.<br /><br />";
             x += '<div id=agins_windows>' + format("To add a new computer to device group \"{0}\", download the mesh agent and install it the computer to manage. This agent has server and device group information embedded within it.", EscapeHtml(mesh.name)) + '<br /><br />';
             x += addHtmlValue("Mesh Agent", '<a id=aginsw32lnk href="meshagents?id=3&meshid=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)" title="' + "32bit version of the MeshAgent" + '">' + "Windows (.exe)" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy Windows 32bit agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=3&meshid=' + meshid.split('/')[2] + '&installflags=",1)>');
             x += addHtmlValue("Mesh Agent", '<a id=aginsw64lnk href="meshagents?id=4&meshid=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)" title="' + "64bit version of the MeshAgent" + '">' + "Windows x64 (.exe)" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy Windows 64bit agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=4&meshid=' + meshid.split('/')[2] + '&installflags=",1)>');
@@ -4139,9 +4136,9 @@
             x += '<textarea id=agins_linux_area rows=2 cols=20 readonly=readonly style=width:100%;resize:none;height:120px;overflow:scroll;font-size:12px readonly></textarea>';
             x += '<div style=\'font-size:x-small\'>' + "* For BSD, run \"pkg install wget sudo bash\" first." + '</div></div>';
 
-            // MacOS agent install
+            // macOS agent install
             x += '<div id=agins_osx style=display:none>' + format("To add a new computer to device group \"{0}\", download the mesh agent and install it the computer to manage. This agent installer has server and device group information embedded within it.", EscapeHtml(mesh.name)) + '<br /><br />';
-            x += addHtmlValue("Mesh Agent", '<a href="meshosxagent?id=16&meshid=' + meshid.split('/')[2] + (urlargs.key?('&key=' + urlargs.key):'') + '" download rel="noreferrer noopener" target="_blank" title="' + "64bit version of MacOS Mesh Agent" + '">MacOS Agent (64bit)</a> <img src=images/link4.png height=10 width=10 title="' + "Copy MacOS agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshosxagent?id=16&meshid=' + meshid.split('/')[2] + '",0)>');
+            x += addHtmlValue("Mesh Agent", '<a href="meshosxagent?id=16&meshid=' + meshid.split('/')[2] + (urlargs.key?('&key=' + urlargs.key):'') + '" download rel="noreferrer noopener" target="_blank" title="' + "64bit version of macOS Mesh Agent" + '">macOS Agent (64bit)</a> <img src=images/link4.png height=10 width=10 title="' + "Copy macOS agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshosxagent?id=16&meshid=' + meshid.split('/')[2] + '",0)>');
             x += '</div>';
 
             // Windows agent uninstall
@@ -4155,12 +4152,10 @@
             x += '<textarea id=agins_linux_area_un rows=2 cols=20 readonly=readonly style=width:100%;resize:none;height:120px;overflow:scroll;font-size:12px readonly></textarea>';
             x += '</div>';
 
-            if (debugmode > 0) { 
+            // Linux binary installer
-                // Linux binary installer
+            x += '<div id=agins_linux_inst style=display:none>' + "This is a executable on OS's with graphical user interfaces. You need to 'chmod +x meshagent' and run this file." + '<br /><br />';
-                x += '<div id=agins_linux_inst style=display:none>' + "This is a executable that will only run as root and on OS's with graphical user interfaces." + '<br /><br />';
+            x += addHtmlValue("Mesh Agent", '<a id=aginsbinlnk href="meshagents?id=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)">' + "meshagent" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=' + meshid.split('/')[2] + '&installflags=",1)>');
-                x += addHtmlValue("Mesh Agent", '<a id=aginsbinlnk href="meshagents?id=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)">' + "meshagent" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=' + meshid.split('/')[2] + '&installflags=",1)>');
+            x += '</div>';
-                x += '</div>';
-            }
 
             setDialogMode(2, "Add Mesh Agent", 2, null, x, 'fileDownload');
             var servername = serverinfo.name;
@@ -4210,7 +4205,7 @@
             var c = 'https://' + servername + portStr + domainUrl + url;
             if (addflag == 1) c += Q('aginsType').value;
             c += (urlargs.key?('&key=' + urlargs.key):'');
-            if (debugmode > 0) { if (Q('aginsSelect').value == 5) { c += '&meshinstall=' + Q('aginsSysType').value; } }
+            if (Q('aginsSelect').value == 5) { c += '&meshinstall=' + Q('aginsSysType').value; }
             copyTextToClip(c);
         }
 
@@ -4221,17 +4216,15 @@
             QV('agins_osx', v == 2);
             QV('agins_windows_un', v == 3);
             QV('agins_linux_un', v == 4);
-            if (debugmode > 0) {
+            QV('agins_linux_inst', v == 5);
-                QV('agins_linux_inst', v == 5);
+            QV('aginsSysTypeDiv', v == 5);
-                QV('aginsSysTypeDiv', v == 5);
+            Q('aginsbinlnk').href = (Q('aginsbinlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'') + '&meshinstall=' + Q('aginsSysType').value;
-                Q('aginsbinlnk').href = (Q('aginsbinlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'') + '&meshinstall=' + Q('aginsSysType').value;
-            }
             QV('aginsTypeDiv', (v == 0) || (v == 5));
 
             // Fix the links if needed
             Q('aginsw32lnk').href = (Q('aginsw32lnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'');
             Q('aginsw64lnk').href = (Q('aginsw64lnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'');
-            if (debugmode > 0) { Q('aginswmshlnk').href = (Q('aginswmshlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):''); }
+            Q('aginswmshlnk').href = (Q('aginswmshlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'');
         }
 
         function validateDeviceToMesh() {
@@ -6287,7 +6280,7 @@
             y += '<option value=4>' + "Windows (64bit)" + '</option>';
             y += '<option value=5>' + "Linux x86 (32bit)" + '</option>';
             y += '<option value=6>' + "Linux x86 (64bit)" + '</option>';
-            y += '<option value=16>' + "MacOS (64bit)" + '</option>';
+            y += '<option value=16>' + "macOS (64bit)" + '</option>';
             y += '<option value=25>' + "Linux ARM, Raspberry Pi (32bit)" + '</option>';
             y += '</select>';
 
@@ -6310,7 +6303,7 @@
             if (os == 4) { osn = "MeshCmd (Win64 executable)"; }
             if (os == 5) { osn = "MeshCmd (Linux x86, 32bit)"; }
             if (os == 6) { osn = "MeshCmd (Linux x86, 64bit)"; }
-            if (os == 16) { osn = "MeshCmd (MacOS, 64bit)"; }
+            if (os == 16) { osn = "MeshCmd (macOS, 64bit)"; }
             if (os == 25) { osn = "MeshCmd (Linux ARM, 32bit)"; }
             QH('meshcmddownloadid', osn);
             Q('meshcmddownloadid').setAttribute('href', 'meshagents?meshcmd=' + os + (urlargs.key?('&key=' + urlargs.key):''));
@@ -6447,7 +6440,7 @@
             var hwonline = ((currentNode.conn & 6) != 0); // If CIRA (2) or AMT (4) connected, enable hardware terminal
             QE('connectbutton1h', hwonline);
             QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (deskState != 0) && (desktopsettings.showfocus));
-            QV('DeskClip', (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on MacOS
+            QV('DeskClip', (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on macOS
             QE('DeskClip', deskState == 3);
             QE('DeskType', deskState == 3);
             QV('DeskWD', inputAllowed);
@@ -7260,7 +7253,7 @@
         var deskPreferedStickyDisplay = -1;
         function deskSetDisplay(e) { desktop.m.SetDisplay(deskPreferedStickyDisplay = parseInt(Q('termdisplays').value)); Q('termdisplays').blur(); }
 
-        // Double click detection. This is important for MacOS.
+        // Double click detection. This is important for macOS.
         var dblClickDetectArgs = { t:0, x:0, y:0 };
         function dblClickDetect(e) {
             if (e.buttons != 1) return;