From 234acd3347d6d612d7c7f372c37be12d65d9684f Mon Sep 17 00:00:00 2001 From: si458 Date: Mon, 4 Mar 2024 12:50:22 +0000 Subject: [PATCH] add displayname to macos pkg Signed-off-by: si458 --- agents/MeshAgentOSXPackager.zip | Bin 595402 -> 595405 bytes webserver.js | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/agents/MeshAgentOSXPackager.zip b/agents/MeshAgentOSXPackager.zip index c4936a6681f72540a2bd35250e657c4c12f6199f..4f2dd275dfabc9bb67e3c9a2eeee3f1317540e92 100644 GIT binary patch delta 1231 zcmZ8e3s6*L6yEz^_Okyz?k>yn7=#U69<@F|9wQhPxh_q^Lzn?4B#Q`&6f_xzU;#H0 zLx+R_+0zJ8NLbUxBi2C}*9y@F^AR*<8S&UOgpsjXAF)^q{r5sOdS}i(=lj0%pE>{c ze`^lBYz}-sPIfXk=Y=4-O8f;S5CqgGg&PNVkA+Fk%&&=@&VO>eC)<0i*KQx_U_;-h z7B+Kq|ILvuMMij_;f)9P+x;{$Ym!&x$BtHq z4Czn2lARm-`}TH8xh+k1d|U9Yo|5Ril%F?UYL0)k1iZ$qXVZ;e z>NgsSs}>Z=Lp7=P&(aMVoAaJ;L&RW6u->QfLQdhC;oGL!y5^#&n~&GB2Zl6b3Y{VK zWNUusOR1Z?-ddQ5uwE_pnv%3d45;JpDBly>KJRcfkNNC5Jdxo4)9Nksbf~(murF#= zs`m21J%`xz^b_&AUvo;Q8sZ%9SdJYr<|OE!Yw_E8Re0b^(vQ8t$`O~z@T`no(!9wx z-*p)4+m#KD@#}M&c6?G7dwqVPu=w=R?%q(}*r$T_MrO%|&s)-k55Dd@cTU&WUDOtR zq;!q5!fto8&wO~8Zb@lw^c*#>wS_uuRh`$iRSxz3kv8pLG<;!$P2rp$@NSvEzcYO6 zOxgG6llqe3V!quH;x};0Qd?Cvu{v6MxW68%5LP}&6~S>Lk>NQ z$Y;MERqGK&g3B}s7ZO4e3<=j$dL;VjuZLe7?l?txXgvbTi8Nqb6lqZb55i!K0|PvW zfw(0CSek2#Y0RP}(8CkL6+*~1X|NUv7#>5u7<)FgVl~o=mWc`qdqN$Kk)M=fbYMVaaQO)b#{w5o$@McKyAcLo5 zhMZ5koagZW6T!gL0f?lH)ik1D=)Rebg|Q(mh6Z3VlJB~zI627)d7#aNFPHZy4k~=n1W-zMoR_Ydfr^1=^MwWq8mWhGaJV;9k O)O+9v#^e+cTmAusVz=}F delta 1240 zcmY+B4Nz276vy}7w;%8B$J^yQc5>yb&_!2R*I>nMAPAjg2N^&ZffOM@hD2}(l8+@q zaTE>Q**Ojcgfo>zt(YUSn4pbid{{{#Q)7@AnPNarkP5roeXKe3X3o3k{LVRd&i$Wj z?LqzRK@Cx|Pm1;!U+mG(SScRQz0s&OB^Le=s;C+}9XfL7%CbYaEhs5ft-G#`?Qb|S zw_|8?{_vT=`Il0w4Dh2mMNoBSDsrs!&UDZHxewNj`#gTX`P!}Z%{5W!wxgX!)-c=` z*|plLeVtyJ{e5uTgYLlV`RQ+@8Cp_~iE8idp4>2Ux_PZW*=kG~@s002mH&}4<73mZ z$47F5o5JtvF4{JY&i-6bTxPgKk|IJOmD|6$ZSM0E;_%p{* z{fe`xb(g;Qx~sBgP3@@K!|7h!!Pb@@Q#IdBuju%_fqtZlj{CNCL;3B@!tj$f4*EI~ z-M*(_VBg-x+pRbF0m=2O@_75Y=CZlGG?T(J?xzoP!-}Kctq6H*wjiu6<|^}7#ZZ#$ z<+*#i9a)_%2IKSQ=_3;hS?AI$%k^bd8m+G_VBfit?k^jXE%+6jfNK{ zc=VaPAm?`;jL z(;$i%chbc8#012I#6;&ci0PjH|CV9a&g7vGWR7M7p~k_eQ9kE~!YJo=a=spJ+8HS% zI2jd^(2GEfu@Cev0>L7zVxB~5806zhaftw46g=reE zKod_$1|M&vR>N`uj)iv|ND6=Rv6|}OKqakmB4}iAI{ad1Bp?uC6>V{$ZBQ-5k*FL& zG{!lc2G2s2oaRfp(Rn-tvH8VZ5%h@2OowQ$aKB5Gy$pGRiqDZ6=x{P}@W)t1ZHFj~ z&!XcZS1D0LhwRuDR8!a+6ciCKUP77$(x+Gho>ERinTrrf!l;w*s}wg-flwsF?~%ul zqZq1LtfRFK0r(4WA~13sNpE#7M)A<1z(P17$7=ekB}f7O3ap_fV2c7<&=i711x|t; zv=Bp#8+nvc$dMQ@GQuarjk%FgCPhzi0OYun!cVb_uwtPc#yO%EyGXrQD28+oLNX;T z(kl_lV1y%Psf)yU5~WYcxIhV3r$EfDSqxib*d1CN42%9)n)`3XVvu{0VRY=0K9ZAi cI(S0~$?;1T7#=)gaRAu7Fe^0M8M3y20he;MLjV8( diff --git a/webserver.js b/webserver.js index e05b8d02..d99bb551 100644 --- a/webserver.js +++ b/webserver.js @@ -5849,6 +5849,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF meshfilename = meshfilename.split('meshagent').join(domain.agentcustomization.filename).split('MeshAgent').join(domain.agentcustomization.filename); } + // Customise the mesh agent display name + var meshdisplayname = 'Mesh Agent'; + if ((domain.agentcustomization != null) && (typeof domain.agentcustomization.displayname == 'string')) { + meshdisplayname = meshdisplayname.split('Mesh Agent').join(domain.agentcustomization.displayname); + } + // Set the agent download including the mesh name. setContentDispositionHeader(res, 'application/octet-stream', meshfilename, null, 'MeshAgent.zip'); archive.pipe(res); @@ -5869,9 +5875,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF readStream.on('data', function (data) { if (readStream.xxdata) { readStream.xxdata += data; } else { readStream.xxdata = data; } }); readStream.on('end', function () { var meshname = mesh.name.split(']').join('').split('[').join(''); // We can't have ']]' in the string since it will terminate the CDATA. - var welcomemsg = 'Welcome to the MeshCentral agent for MacOS\n\nThis installer will install the mesh agent for "' + meshname + '" and allow the administrator to remotely monitor and control this computer over the internet. For more information, go to https://www.meshcommander.com/meshcentral2.\n\nThis software is provided under Apache 2.0 license.\n'; + var welcomemsg = 'Welcome to the MeshCentral agent for MacOS\n\nThis installer will install the mesh agent for "' + meshname + '" and allow the administrator to remotely monitor and control this computer over the internet. For more information, go to https://meshcentral.com.\n\nThis software is provided under Apache 2.0 license.\n'; var installsize = Math.floor((argentInfo.size + meshsettings.length) / 1024); - archive.append(readStream.xxdata.toString().split('###WELCOMEMSG###').join(welcomemsg).split('###INSTALLSIZE###').join(installsize), { name: entry.fileName }); + archive.append(readStream.xxdata.toString().split('###DISPLAYNAME###').join(meshdisplayname).split('###WELCOMEMSG###').join(welcomemsg).split('###INSTALLSIZE###').join(installsize), { name: entry.fileName }); zipfile.readEntry(); }); });