1 files changed, 52 insertions, 20 deletions

diff --git a/server/tools/cli.ts b/server/tools/cli.ts
index 108c44218..59e9fcfc4 100644
--- a/server/tools/cli.ts
+++ b/server/tools/cli.ts
@@ -3,51 +3,83 @@ const netrc = require('netrc-parser').default
 
 const version = require('../../../package.json').version
 
-let settings = {
-  remotes: [],
-  default: 0
-}
-
 interface Settings {
   remotes: any[],
   default: number
 }
 
-async function getSettings () {
+function getSettings () {
   return new Promise<Settings>((res, rej) => {
-    let settings = {
+    const defaultSettings = {
       remotes: [],
       default: 0
-    } as Settings
+    }
+
     config.read((err, data) => {
-      if (err) {
-        return rej(err)
-      }
-      return res(Object.keys(data).length === 0 ? settings : data)
+      if (err) return rej(err)
+
+      return res(Object.keys(data).length === 0 ? defaultSettings : data)
     })
   })
 }
 
-async function writeSettings (settings) {
+async function getNetrc () {
+  await netrc.load()
+
+  return netrc
+}
+
+function writeSettings (settings) {
   return new Promise((res, rej) => {
     config.write(settings, function (err) {
-      if (err) {
-        return rej(err)
-      }
+      if (err) return rej(err)
+
       return res()
     })
   })
 }
 
-netrc.loadSync()
+function getRemoteObjectOrDie (program: any, settings: Settings) {
+  if (!program['url'] || !program['username'] || !program['password']) {
+    // No remote and we don't have program parameters: throw
+    if (settings.remotes.length === 0) {
+      if (!program[ 'url' ]) console.error('--url field is required.')
+      if (!program[ 'username' ]) console.error('--username field is required.')
+      if (!program[ 'password' ]) console.error('--password field is required.')
+
+      return process.exit(-1)
+    }
+
+    let url: string = program['url']
+    let username: string = program['username']
+    let password: string = program['password']
+
+    if (!url) {
+      url = settings.default !== -1
+        ? settings.remotes[settings.default]
+        : settings.remotes[0]
+    }
+
+    if (!username) username = netrc.machines[url].login
+    if (!password) password = netrc.machines[url].password
+
+    return { url, username, password }
+  }
+
+  return {
+    url: program[ 'url' ],
+    username: program[ 'username' ],
+    password: program[ 'password' ]
+  }
+}
 
 // ---------------------------------------------------------------------------
 
 export {
   version,
   config,
-  settings,
   getSettings,
-  writeSettings,
-  netrc
+  getNetrc,
+  getRemoteObjectOrDie,
+  writeSettings
 }