hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix tcsh path.

Browse Source 
Signed-off-by: Panu Horsmalahti <phorsmalahti@mirantis.com>
This commit is contained in:
Panu Horsmalahti 2022-10-21 16:28:57 +03:00
parent 97fc7cf6fb
commit ffce337827
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts
View File

@ -38,17 +38,12 @@ const computeUnixShellEnvironmentInjectable = getInjectable({
} else { } else {
command = `'${process.execPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`; command = `'${process.execPath}' -p '"${mark}" + JSON.stringify(process.env) + "${mark}"'`;
if (shellName === "tcsh") { shellArgs = ["-l"];
shellArgs = ["-ic"];
} else {
shellArgs = ["-ilc"];
}
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const shellProcess = spawn(shell, [...shellArgs, command], { const shellProcess = spawn(shell, [...shellArgs], {
detached: true, detached: true,
stdio: ["ignore", "pipe", "pipe"],
env, env,
}); });
const stdout: Buffer[] = []; const stdout: Buffer[] = [];
@ -57,6 +52,10 @@ const computeUnixShellEnvironmentInjectable = getInjectable({
shellProcess.on("error", (err) => reject(err)); shellProcess.on("error", (err) => reject(err));
shellProcess.stdout.on("data", b => stdout.push(b)); shellProcess.stdout.on("data", b => stdout.push(b));
shellProcess.stdin.write(command);
shellProcess.stdin.end(command);
shellProcess.on("close", (code, signal) => { shellProcess.on("close", (code, signal) => {
if (code || signal) { if (code || signal) {
return reject(new Error(`Unexpected return code from spawned shell (code: ${code}, signal: ${signal})`)); return reject(new Error(`Unexpected return code from spawned shell (code: ${code}, signal: ${signal})`));
@ -64,6 +63,7 @@ const computeUnixShellEnvironmentInjectable = getInjectable({
try { try {
const rawOutput = Buffer.concat(stdout).toString("utf-8"); const rawOutput = Buffer.concat(stdout).toString("utf-8");
const match = regex.exec(rawOutput); const match = regex.exec(rawOutput);
const strippedRawOutput = match ? match[1] : "{}"; const strippedRawOutput = match ? match[1] : "{}";
const resolvedEnv = JSON.parse(strippedRawOutput); const resolvedEnv = JSON.parse(strippedRawOutput);