opensource/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2025-07-31 22:13:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Parse arguments once

Browse Source 
Fixes #2316.
This commit is contained in:
Asher
2020-11-18 13:01:46 -06:00
parent 247c4ec776
commit 016daf2fdd
2 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/node/entry.ts
View File

@ -154,19 +154,22 @@ const main = async (args: DefaultedArgs): Promise<void> => {
}
async function entry(): Promise<void> {
const cliArgs = parse(process.argv.slice(2))
const configArgs = await readConfigFile(cliArgs.config)
const args = await setDefaults(cliArgs, configArgs)
// There's no need to check flags like --help or to spawn in an existing
// instance for the child process because these would have already happened in
// the parent and the child wouldn't have been spawned.
// the parent and the child wouldn't have been spawned. We also get the
// arguments from the parent so we don't have to parse twice and to account
// for environment manipulation (like how PASSWORD gets removed to avoid
// leaking to child processes).
if (isChild(wrapper)) {
await wrapper.handshake()
const args = await wrapper.handshake()
wrapper.preventExit()
return main(args)
}
const cliArgs = parse(process.argv.slice(2))
const configArgs = await readConfigFile(cliArgs.config)
const args = await setDefaults(cliArgs, configArgs)
if (args.help) {
console.log("code-server", version, commit)
console.log("")
@ -201,7 +204,7 @@ async function entry(): Promise<void> {
return openInExistingInstance(args, socketPath)
}
return wrapper.start()
return wrapper.start(args)
}
entry().catch((error) => {