Shell path -> shell executable

Tyriar · Tyriar · commit 71b845cca22a · 2020-07-01T06:52:54.000-07:00
Fixes microsoft#101482
diff --git a/src/vs/workbench/contrib/terminal/node/terminalProcess.ts b/src/vs/workbench/contrib/terminal/node/terminalProcess.ts
@@ -111,7 +111,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 		try {
 			const result = await stat(slc.executable);
 			if (!result.isFile() && !result.isSymbolicLink()) {
-				return { message: localize('launchFail.executableIsNotFileOrSymlink', "Shell path \"{0}\" is not a file of a symlink", slc.executable) };
+				return { message: localize('launchFail.executableIsNotFileOrSymlink', "Path to shell executable \"{0}\" is not a file of a symlink", slc.executable) };
 			}
 		} catch (err) {
 			if (err?.code === 'ENOENT') {
@@ -120,7 +120,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess
 				const envPaths: string[] | undefined = (slc.env && slc.env.PATH) ? slc.env.PATH.split(path.delimiter) : undefined;
 				const executable = await findExecutable(slc.executable!, cwd, envPaths);
 				if (!executable) {
-					return { message: localize('launchFail.executableDoesNotExist', "Shell path \"{0}\" does not exist", slc.executable) };
+					return { message: localize('launchFail.executableDoesNotExist', "Path to shell executable \"{0}\" does not exist", slc.executable) };
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess`
`111`	`111`	`try {`
`112`	`112`	`const result = await stat(slc.executable);`
`113`	`113`	`if (!result.isFile() && !result.isSymbolicLink()) {`
`114`		`- return { message: localize('launchFail.executableIsNotFileOrSymlink', "Shell path \"{0}\" is not a file of a symlink", slc.executable) };`
	`114`	`+ return { message: localize('launchFail.executableIsNotFileOrSymlink', "Path to shell executable \"{0}\" is not a file of a symlink", slc.executable) };`
`115`	`115`	`}`
`116`	`116`	`} catch (err) {`
`117`	`117`	`if (err?.code === 'ENOENT') {`
`@@ -120,7 +120,7 @@ export class TerminalProcess extends Disposable implements ITerminalChildProcess`
`120`	`120`	`const envPaths: string[] \| undefined = (slc.env && slc.env.PATH) ? slc.env.PATH.split(path.delimiter) : undefined;`
`121`	`121`	`const executable = await findExecutable(slc.executable!, cwd, envPaths);`
`122`	`122`	`if (!executable) {`
`123`		`- return { message: localize('launchFail.executableDoesNotExist', "Shell path \"{0}\" does not exist", slc.executable) };`
	`123`	`+ return { message: localize('launchFail.executableDoesNotExist', "Path to shell executable \"{0}\" does not exist", slc.executable) };`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`}`