From 85b0804be5174940851ebdccc7d58b3eba581a32 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <hi@nhooyr.io>
Date: Wed, 7 Oct 2020 16:21:10 -0400
Subject: [PATCH] Remove cliArgs from main

No purpose when all the args are in the args parameter.

We only need configArgs for bindAddrFromAllSources.
---
 ci/build/build-release.sh |  1 -
 src/node/entry.ts         | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh
index 88d3fe61..eedda98e 100755
--- a/ci/build/build-release.sh
+++ b/ci/build/build-release.sh
@@ -58,7 +58,6 @@ EOF
   rsync yarn.lock "$RELEASE_PATH"
   rsync ci/build/npm-postinstall.sh "$RELEASE_PATH/postinstall.sh"
 
-
   if [ "$KEEP_MODULES" = 1 ]; then
     rsync node_modules/ "$RELEASE_PATH/node_modules"
   fi
diff --git a/src/node/entry.ts b/src/node/entry.ts
index a39db7ef..66413419 100644
--- a/src/node/entry.ts
+++ b/src/node/entry.ts
@@ -35,11 +35,11 @@ try {
 const version = pkg.version || "development"
 const commit = pkg.commit || "development"
 
-const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void> => {
+const main = async (args: Args, configArgs: Args): Promise<void> => {
   if (args["coder-bind"]) {
     // If we're being exposed to the cloud, we listen on a random address and disable auth.
-    cliArgs = {
-      ...cliArgs,
+    args = {
+      ...args,
       host: "localhost",
       port: 0,
       auth: AuthType.None,
@@ -64,7 +64,7 @@ const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void>
   if (args.auth === AuthType.Password && !password) {
     throw new Error("Please pass in a password via the config file or $PASSWORD")
   }
-  const [host, port] = bindAddrFromAllSources(cliArgs, configArgs)
+  const [host, port] = bindAddrFromAllSources(args, configArgs)
 
   // Spawn the main HTTP server.
   const options: HttpServerOptions = {
@@ -153,21 +153,21 @@ const main = async (args: Args, cliArgs: Args, configArgs: Args): Promise<void>
 }
 
 async function entry(): Promise<void> {
-  const tryParse = async (): Promise<[Args, Args, Args]> => {
+  const tryParse = async (): Promise<[Args, Args]> => {
     try {
       const cliArgs = parse(process.argv.slice(2))
       const configArgs = await readConfigFile(cliArgs.config)
       // This prioritizes the flags set in args over the ones in the config file.
       let args = Object.assign(configArgs, cliArgs)
       args = await setDefaults(args)
-      return [args, cliArgs, configArgs]
+      return [args, configArgs]
     } catch (error) {
       console.error(error.message)
       process.exit(1)
     }
   }
 
-  const [args, cliArgs, configArgs] = await tryParse()
+  const [args, configArgs] = await tryParse()
   if (args.help) {
     console.log("code-server", version, commit)
     console.log("")
@@ -262,7 +262,7 @@ async function entry(): Promise<void> {
     vscode.write(JSON.stringify(pipeArgs))
     vscode.end()
   } else {
-    wrap(() => main(args, cliArgs, configArgs))
+    wrap(() => main(args, configArgs))
   }
 }