fix: terminal args parsing + default mac/linux args

ietf-tools · Feb 17, 2025 · 7b25012 · 7b25012
1 parent 36a3259
commit 7b25012
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src-electron/terminal.js b/src-electron/terminal.js
@@ -8,7 +8,7 @@ const defaultShell = {
 switch (os.platform()) {
   case 'darwin':
     defaultShell.cmd = 'zsh'
-    defaultShell.args = ''
+    defaultShell.args = '-i'
     break
   case 'win32':
     defaultShell.cmd = 'pwsh.exe'
@@ -23,7 +23,7 @@ export default {
    */
   initialize (mainWindow, opts = {}) {
     if (this.term) { return }
-    this.term = pty.spawn(opts.shell || defaultShell.cmd, (opts.args ?? defaultShell.args).split(' '), {
+    this.term = pty.spawn(opts.shell || defaultShell.cmd, (opts.args ?? defaultShell.args).split(' ').filter(a => a), {
       name: 'draftforge-terminal',
       cols: 80,
       rows: 30,

diff --git a/src/stores/editor.js b/src/stores/editor.js
@@ -5,12 +5,12 @@ import { decorationsStore } from 'src/stores/models'
 
 const defaultShell = {
   cmd: 'bash',
-  args: ''
+  args: '-i'
 }
 switch (process.env.OS_PLATFORM) {
   case 'darwin':
     defaultShell.cmd = 'zsh'
-    defaultShell.args = ''
+    defaultShell.args = '-i'
     break
   case 'win32':
     defaultShell.cmd = 'pwsh.exe'