Updated so Powershell tries to load 64 bit on 64bit windows before falling back to 32 bit
Bryan Roe committed
Mar 14, 2021 at 18:27 UTC
ca5a1a7d7bbfb44cd630a81f644c397c7dea592d
2 files changed
+16
-2
agents/modules_meshcore/win-terminal.js
+8
-1
@@ -251,7 +251,14 @@ function windows_terminal() {
251
{
252
if (require('os').arch() == 'x64')
253
{
254
- return (this.StartEx(CONSOLE_SCREEN_WIDTH, CONSOLE_SCREEN_HEIGHT, process.env['windir'] + '\\SysWow64\\WindowsPowerShell\\v1.0\\powershell.exe'));
254
+ if (require('fs').existsSync(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe'))
255
+ {
256
+ return (this.StartEx(CONSOLE_SCREEN_WIDTH, CONSOLE_SCREEN_HEIGHT, process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe'));
257
+ }
258
+ else
259
+ {
260
+ return (this.StartEx(CONSOLE_SCREEN_WIDTH, CONSOLE_SCREEN_HEIGHT, process.env['windir'] + '\\SysWow64\\WindowsPowerShell\\v1.0\\powershell.exe'));
261
+ }
262
}
263
else
264
{
agents/modules_meshcore/win-virtual-terminal.js
+8
-1
@@ -192,7 +192,14 @@ function vt()
192
{
193
if (require('os').arch() == 'x64')
194
{
195
- return (this.Create(process.env['windir'] + '\\SysWow64\\WindowsPowerShell\\v1.0\\powershell.exe', CONSOLE_SCREEN_WIDTH, CONSOLE_SCREEN_HEIGHT));
195
+ if (require('fs').existsSync(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe'))
196
+ {
197
+ return (this.Create(process.env['windir'] + '\\System32\\WindowsPowerShell\\v1.0\\powershell.exe', CONSOLE_SCREEN_WIDTH, CONSOLE_SCREEN_HEIGHT));
198
+ }
199
+ else
200
+ {
201
+ return (this.Create(process.env['windir'] + '\\SysWow64\\WindowsPowerShell\\v1.0\\powershell.exe', CONSOLE_SCREEN_WIDTH, CONSOLE_SCREEN_HEIGHT));
202
+ }
203
}
204
else
205
{