fix: process name on macOS

CyanSalt · Sep 12, 2023 · b5d0f0c · b5d0f0c
1 parent a6a0677
commit b5d0f0c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "file-icon": "^4.0.0",
     "fuzzaldrin-plus": "^0.6.0",
     "lodash": "^4.17.21",
-    "node-pty": "^1.0.0",
+    "node-pty": "^1.1.0-beta4",
     "properties": "^1.2.1",
     "semver": "^7.5.4",
     "shell-history": "^1.1.0",

diff --git a/src/main/lib/terminal.ts b/src/main/lib/terminal.ts
@@ -12,12 +12,6 @@ import { useSettings, whenSettingsReady } from './settings'
 
 const ptyProcessMap = new Map<number, IPty>()
 
-function readProcess(ptyProcess: IPty) {
-  const processName = ptyProcess.process
-  // FIXME: sometimes the `process` is a symbol
-  return typeof processName === 'string' ? processName : undefined
-}
-
 async function createTerminal(
   webContents: WebContents,
   { shell, args, env, cwd }: Partial<TerminalContext>,
@@ -72,7 +66,7 @@ async function createTerminal(
     if (!webContents.isDestroyed()) {
       webContents.send('input-terminal', {
         pid: ptyProcess.pid,
-        process: readProcess(ptyProcess) ?? shell,
+        process: ptyProcess.process,
         data,
       })
     }
@@ -89,7 +83,7 @@ async function createTerminal(
   ptyProcessMap.set(ptyProcess.pid, ptyProcess)
   return {
     pid: ptyProcess.pid,
-    process: readProcess(ptyProcess) ?? shell,
+    process: ptyProcess.process,
     cwd,
     shell,
     args,