cb84547c88
Fixes #326 ## Summary - source the user's bash or zsh rc before launching the bundled CLI from Tauri - use `-l -i -c` for zsh so shell-managed Node runtimes are available in launcher-started sessions - fixes the reproduced Linux launcher case where the app exits with `CLI exited early: exit status: 127` while terminal launches work ## Validation - reproduced the failure with the released Tauri `v0.14.0` Linux binary - verified the patched binary succeeds under the same launcher-like environment - ran `cargo build` on the dev-based PR branch
125 lines
3.1 KiB
TypeScript
125 lines
3.1 KiB
TypeScript
import { spawn, spawnSync } from "child_process"
|
|
import path from "path"
|
|
|
|
interface ShellCommand {
|
|
command: string
|
|
args: string[]
|
|
}
|
|
|
|
const isWindows = process.platform === "win32"
|
|
|
|
function getDefaultShellPath(): string {
|
|
if (process.env.SHELL && process.env.SHELL.trim().length > 0) {
|
|
return process.env.SHELL
|
|
}
|
|
|
|
if (process.platform === "darwin") {
|
|
return "/bin/zsh"
|
|
}
|
|
|
|
return "/bin/bash"
|
|
}
|
|
|
|
function buildShellArgs(shellPath: string): string[] {
|
|
const shellName = path.basename(shellPath)
|
|
if (shellName.includes("zsh") || shellName.includes("bash")) {
|
|
return ["-i", "-l", "-c"]
|
|
}
|
|
return ["-l", "-c"]
|
|
}
|
|
|
|
function sanitizeShellEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
|
|
const cleaned = { ...env }
|
|
delete cleaned.npm_config_prefix
|
|
delete cleaned.NPM_CONFIG_PREFIX
|
|
return cleaned
|
|
}
|
|
|
|
export function supportsUserShell(): boolean {
|
|
return !isWindows
|
|
}
|
|
|
|
export function buildUserShellCommand(userCommand: string): ShellCommand {
|
|
if (!supportsUserShell()) {
|
|
throw new Error("User shell invocation is only supported on POSIX platforms")
|
|
}
|
|
|
|
const shellPath = getDefaultShellPath()
|
|
const args = buildShellArgs(shellPath)
|
|
|
|
return {
|
|
command: shellPath,
|
|
args: [...args, userCommand],
|
|
}
|
|
}
|
|
|
|
export function getUserShellEnv(): NodeJS.ProcessEnv {
|
|
if (!supportsUserShell()) {
|
|
throw new Error("User shell invocation is only supported on POSIX platforms")
|
|
}
|
|
return sanitizeShellEnv(process.env)
|
|
}
|
|
|
|
export function runUserShellCommand(userCommand: string, timeoutMs = 5000): Promise<string> {
|
|
if (!supportsUserShell()) {
|
|
return Promise.reject(new Error("User shell invocation is only supported on POSIX platforms"))
|
|
}
|
|
|
|
const { command, args } = buildUserShellCommand(userCommand)
|
|
const env = getUserShellEnv()
|
|
|
|
return new Promise((resolve, reject) => {
|
|
const child = spawn(command, args, {
|
|
stdio: ["ignore", "pipe", "pipe"],
|
|
env,
|
|
})
|
|
|
|
let stdout = ""
|
|
let stderr = ""
|
|
|
|
const timeout = setTimeout(() => {
|
|
child.kill("SIGTERM")
|
|
reject(new Error(`Shell command timed out after ${timeoutMs}ms`))
|
|
}, timeoutMs)
|
|
|
|
child.stdout?.on("data", (data) => {
|
|
stdout += data.toString()
|
|
})
|
|
|
|
child.stderr?.on("data", (data) => {
|
|
stderr += data.toString()
|
|
})
|
|
|
|
child.on("error", (error) => {
|
|
clearTimeout(timeout)
|
|
reject(error)
|
|
})
|
|
|
|
child.on("close", (code) => {
|
|
clearTimeout(timeout)
|
|
if (code === 0) {
|
|
resolve(stdout.trim())
|
|
} else {
|
|
reject(new Error(stderr.trim() || `Shell command exited with code ${code}`))
|
|
}
|
|
})
|
|
})
|
|
}
|
|
|
|
export function runUserShellCommandSync(userCommand: string): string {
|
|
if (!supportsUserShell()) {
|
|
throw new Error("User shell invocation is only supported on POSIX platforms")
|
|
}
|
|
|
|
const { command, args } = buildUserShellCommand(userCommand)
|
|
const env = getUserShellEnv()
|
|
const result = spawnSync(command, args, { encoding: "utf-8", env })
|
|
|
|
if (result.status !== 0) {
|
|
const stderr = (result.stderr || "").toString().trim()
|
|
throw new Error(stderr || "Shell command failed")
|
|
}
|
|
|
|
return (result.stdout || "").toString().trim()
|
|
}
|