fix default linuxshell for mobile ui #6275
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Jul 24, 2024 at 10:15 UTC
10b57dcf9ecce95c31af7896175c23746b2a17c2
3 files changed
+3
-4
meshcentral-config-schema.json
+1
-1
@@ -2128,7 +2128,7 @@
2128
"login"
2129
],
2130
"default": "any",
2131
- "description": "Indicate what terminal options are available when the user clicks the right mouse button on the terminal connect button."
2131
+ "description": "Indicates the default linux terminal thats used when the user clicks the terminal connect button and disables the right mouse button on the terminal connect button when this is set."
2132
},
2133
"launchCommand": {
2134
"type": "object",
views/default-mobile.handlebars
+1
-1
@@ -5409,6 +5409,7 @@
5409
if (termoptions.protocol == 1) { termoptions.protocol = 6; } // Switch to Powershell
5410
}
5411
}
5412
+ */
5413
5414
// If the server requires a shell type
5415
if ((serverinfo.linuxshell) != null && (currentNode.agent.id > 4)) {
@@ -5416,7 +5417,6 @@
5417
if (serverinfo.linuxshell == 'user') { termoptions.protocol = 8; delete termoptions.requireLogin; }
5418
if (serverinfo.linuxshell == 'login') { termoptions.protocol = 1; termoptions.requireLogin = true; }
5419
}
5419
- */
5420
5421
// Setup a mesh agent xterm terminal
5422
QV('termarea3xdiv', true);
views/sharing-mobile.handlebars
+1
-2
@@ -1783,14 +1783,13 @@
1783
if (termoptions.protocol == 1) { termoptions.protocol = 6; } // Switch to Powershell
1784
}
1785
}
1786
-
1786
+ */
1787
// If the server requires a shell type
1788
if ((serverinfo.linuxshell) != null && (currentNode.agent.id > 4)) {
1789
if (serverinfo.linuxshell == 'root') { termoptions.protocol = 1; delete termoptions.requireLogin; }
1790
if (serverinfo.linuxshell == 'user') { termoptions.protocol = 8; delete termoptions.requireLogin; }
1791
if (serverinfo.linuxshell == 'login') { termoptions.protocol = 1; termoptions.requireLogin = true; }
1792
}
1793
- */
1793
1794
// Setup a mesh agent xterm terminal
1795
QV('termarea3xdiv', true);