Prevent doubled usage information output (#820)

* Prevent doubled usage information output

* Return instead of exiting without util

* Made it work

src/providers/sh/commands/alias.js

@@ -136,7 +136,7 @@ const main = async ctx => {
 
   if (argv.help) {
     help()
-    process.exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/billing.js

@@ -15,6 +15,7 @@ const promptBool = require('../../../util/input/prompt-bool')
 const info = require('../../../util/output/info')
 const logo = require('../../../util/output/logo')
 const addBilling = require('./billing/add')
+const exit = require('../../../util/exit')
 
 const help = () => {
   console.log(`
@@ -58,14 +59,6 @@ const help = () => {
   `)
 }
 
-const exit = code => {
-  // We give stdout some time to flush out
-  // because there's a node bug where
-  // stdout writes are asynchronous
-  // https://github.com/nodejs/node/issues/6456
-  setTimeout(() => process.exit(code || 0), 100)
-}
-
 let argv
 let debug
 let apiUrl
@@ -88,7 +81,7 @@ const main = async ctx => {
 
   if (argv.help || !subcommand) {
     help()
-    exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/certs.js

@@ -96,7 +96,7 @@ const main = async ctx => {
 
   if (argv.help || !subcommand) {
     help()
-    exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/deploy.js

@@ -15,7 +15,7 @@ const { eraseLines } = require('ansi-escapes')
 const { write: copy } = require('clipboardy')
 const inquirer = require('inquirer')
 
-// Ours
+// Utilities
 const Logger = require('../util/build-logger')
 const Now = require('../util')
 const toHumanPath = require('../../../util/humanize-path')
@@ -31,6 +31,7 @@ const NowPlans = require('../util/plans')
 const promptBool = require('../../../util/input/prompt-bool')
 const promptOptions = require('../util/prompt-options')
 const note = require('../../../util/output/note')
+const exit = require('../../../util/exit')
 
 const mriOpts = {
   string: ['name', 'alias', 'session-affinity'],
@@ -263,7 +264,7 @@ async function main(ctx) {
 
   if (argv.h || argv.help) {
     help()
-    return 0
+    await exit(0)
   }
 
   const { authConfig: { credentials }, config: { sh } } = ctx

src/providers/sh/commands/dns.js

@@ -85,7 +85,7 @@ const main = async ctx => {
 
   if (argv.help || !subcommand) {
     help()
-    exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/domains.js

@@ -148,7 +148,7 @@ const main = async ctx => {
 
   if (argv.help || !subcommand) {
     help()
-    exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/list.js

@@ -13,6 +13,7 @@ const Now = require('../util')
 const { handleError, error } = require('../util/error')
 const logo = require('../../../util/output/logo')
 const sort = require('../util/sort-deployments')
+const exit = require('../../../util/exit')
 
 const help = () => {
   console.log(`
@@ -69,7 +70,7 @@ const main = async ctx => {
 
   if (argv.help || app === 'help') {
     help()
-    process.exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/logout.js

@@ -16,6 +16,7 @@ const {
   writeToAuthConfigFile
 } = require('../../../util/config-files')
 const error = require('../../../util/output/error')
+const exit = require('../../../util/exit')
 
 const help = () => {
   console.log(`
@@ -58,7 +59,7 @@ const main = async ctx => {
 
   if (argv.help || argv._[0] === 'help') {
     help()
-    process.exit(0)
+    await exit(0)
   }
 
   logout()

src/providers/sh/commands/logs.js

@@ -15,6 +15,7 @@ const { handleError, error } = require('../util/error')
 const logo = require('../../../util/output/logo')
 const { compare, deserialize } = require('../util/logs')
 const { maybeURL, normalizeURL, parseInstanceURL } = require('../../../util/url')
+const exit = require('../../../util/exit')
 
 const help = () => {
   console.log(`
@@ -87,7 +88,7 @@ const main = async ctx => {
 
   if (argv.help || !deploymentIdOrURL || deploymentIdOrURL === 'help') {
     help()
-    process.exit(0)
+    await exit(0)
   }
 
   try {

src/providers/sh/commands/remove.js

@@ -11,6 +11,7 @@ const Now = require('../util')
 const { handleError, error } = require('../util/error')
 const logo = require('../../../util/output/logo')
 const { normalizeURL } = require('../../../util/url')
+const exit = require('../../../util/exit')
 
 const help = () => {
   console.log(`
@@ -84,7 +85,7 @@ const main = async ctx => {
 
   if (argv.help || ids.length === 0 || ids[0] === 'help') {
     help()
-    process.exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/scale.js

@@ -93,7 +93,7 @@ const main = async ctx => {
 
   if (argv.help) {
     help()
-    process.exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/secrets.js

@@ -92,7 +92,7 @@ const main = async ctx => {
 
   if (argv.help || !subcommand) {
     help()
-    exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config: { sh }} = ctx

src/providers/sh/commands/teams.js

@@ -91,7 +91,7 @@ const main = async ctx => {
 
   if (argv.help || !subcommand) {
     help()
-    exit(0)
+    await exit(0)
   }
 
   const {authConfig: { credentials }, config} = ctx

src/util/exit.js

@@ -1,8 +1,7 @@
-module.exports = code => {
+module.exports = code => new Promise(() => {
   // We give stdout some time to flush out
   // because there's a node bug where
   // stdout writes are asynchronous
   // https://github.com/nodejs/node/issues/6456
-  /* eslint-disable unicorn/no-process-exit */
   setTimeout(() => process.exit(code || 0), 100)
-}
+})