Merge branch 'main' into fix-704-trim-command-whitespace
This commit is contained in:
commit
0e30df8801
1 changed files with 669 additions and 40 deletions
|
|
@ -184,7 +184,7 @@ const createTransport = async (req: express.Request): Promise<Transport> => {
|
|||
const command = (query.command as string).trim();
|
||||
const origArgs = shellParseArgs(query.args as string) as string[];
|
||||
const queryEnv = query.env ? JSON.parse(query.env as string) : {};
|
||||
const env = { ...process.env, ...defaultEnvironment, ...queryEnv };
|
||||
const env = { ...defaultEnvironment, ...process.env, ...queryEnv };
|
||||
|
||||
const { cmd, args } = findActualExecutable(command, origArgs);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue