Skip to content

fix: prefer the macOS login shell for new sessions #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samwei12 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prefer the macOS login shell for new sessions #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,19 @@ let sessionCounter = 0;

function getShell(): string {
if (process.platform === 'win32') return 'powershell.exe';
return process.env.SHELL || '/bin/bash';
if (process.platform !== 'darwin') return process.env.SHELL || '/bin/bash';

const envShell = process.env.SHELL;
if (envShell && envShell !== '/bin/bash') return envShell;

try {
const loginShell = os.userInfo().shell;
if (loginShell) return loginShell;
} catch {
/* fall back to inherited env */
}

return envShell || '/bin/bash';
}

function safeSend(ws: any, obj: unknown): void {
Expand Down Expand Up @@ -127,7 +139,13 @@ wss.on('connection', (ws: any) => {
cols: 80,
rows: 24,
cwd,
env: { ...process.env, TERM: 'xterm-256color', COLORTERM: 'truecolor', TERM_PROGRAM: 'web-terminal' },
env: {
...process.env,
SHELL: shell,
TERM: 'xterm-256color',
COLORTERM: 'truecolor',
TERM_PROGRAM: 'web-terminal',
},
});
} catch (err) {
safeSend(ws, { type: 'error', message: `Failed to spawn shell: ${(err as Error).message}` });
Expand Down