From 9a3b3dbf15b02f3df269a3a176ab309eca92b498 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 10 Oct 2020 17:10:06 +0200
Subject: [PATCH] cli: avoid printing duplicate help, and print help on invalid
 command

---
 .changeset/proud-eagles-grow.md |  5 +++++
 packages/cli/src/index.ts       | 10 ++--------
 2 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/proud-eagles-grow.md

diff --git a/.changeset/proud-eagles-grow.md b/.changeset/proud-eagles-grow.md
new file mode 100644
index 0000000000..ef83a4ad26
--- /dev/null
+++ b/.changeset/proud-eagles-grow.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Fixed duplicate help output, and print help on invalid command
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index e278164f4c..28e46bbd1a 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -27,18 +27,12 @@ const main = (argv: string[]) => {
 
   program.on('command:*', () => {
     console.log();
-    console.log(
-      chalk.red(`Invalid command: ${chalk.cyan(program.args.join(' '))}`),
-    );
-    console.log(chalk.red('See --help for a list of available commands.'));
+    console.log(chalk.red(`Invalid command: ${program.args.join(' ')}`));
     console.log();
+    program.outputHelp();
     process.exit(1);
   });
 
-  if (!process.argv.slice(2).length) {
-    program.outputHelp(chalk.yellow);
-  }
-
   program.parse(argv);
 };