From a2dc7fa2cd15219a1f34f0f80cefe357f5c5dad2 Mon Sep 17 00:00:00 2001
From: AshCripps <Ashley.Cripps@ibm.com>
Date: Wed, 27 May 2020 16:05:17 +0100
Subject: [PATCH 1/2] cli: add alias for report-directory to make it consistent

Currently every other cli option uses "dir" to reference a directory
so add an alias to allow for conistency.
---
 doc/api/cli.md      | 3 ++-
 doc/node.1          | 2 +-
 src/node_options.cc | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 0642a852293c73..d062979523ec56 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -639,7 +639,7 @@ Write reports in a compact format, single-line JSON, more easily consumable
 by log processing systems than the default multi-line format designed for
 human consumption.
 
-### `--report-directory=directory`
+### --report-directory=directory`, `report-dir=directory`
 <!-- YAML
 added: v11.8.0
 changes:
@@ -1245,6 +1245,7 @@ Node.js options that are allowed are:
 * `--prof-process`
 * `--redirect-warnings`
 * `--report-compact`
+* `--report-dir`
 * `--report-directory`
 * `--report-filename`
 * `--report-on-fatalerror`
diff --git a/doc/node.1 b/doc/node.1
index 278061424c07c6..6eeb2ed3fd3338 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -291,7 +291,7 @@ Write
 .Sy diagnostic reports
 in a compact format, single-line JSON.
 .
-.It Fl -report-directory
+.It Fl -report-directory Fl -report-dir
 Location at which the
 .Sy diagnostic report
 will be generated.
diff --git a/src/node_options.cc b/src/node_options.cc
index 875c2e73001dc9..894956cc171e95 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -667,9 +667,10 @@ PerProcessOptionsParser::PerProcessOptionsParser(
             kAllowedInEnvironment);
   AddOption("--report-directory",
             "define custom report pathname."
-            " (default: current working directory of Node.js process)",
+            " (default: current working directory)",
             &PerProcessOptions::report_directory,
             kAllowedInEnvironment);
+  AddAlias("--report-dir", "--report-directory");
   AddOption("--report-filename",
             "define custom report file name."
             " (default: YYYYMMDD.HHMMSS.PID.SEQUENCE#.txt)",

From 14fcb57fb70d3c977c695d96d4cd79f617ceadb4 Mon Sep 17 00:00:00 2001
From: AshCripps <Ashley.Cripps@ibm.com>
Date: Wed, 27 May 2020 17:12:55 +0100
Subject: [PATCH 2/2] fixup! cli: add alias for report-directory to make it
 consistent

---
 doc/api/cli.md      | 5 ++---
 doc/node.1          | 2 +-
 src/node_options.cc | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index d062979523ec56..edfe4e97a258fd 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -639,7 +639,7 @@ Write reports in a compact format, single-line JSON, more easily consumable
 by log processing systems than the default multi-line format designed for
 human consumption.
 
-### --report-directory=directory`, `report-dir=directory`
+### --report-dir=directory`, `report-directory=directory`
 <!-- YAML
 added: v11.8.0
 changes:
@@ -1245,8 +1245,7 @@ Node.js options that are allowed are:
 * `--prof-process`
 * `--redirect-warnings`
 * `--report-compact`
-* `--report-dir`
-* `--report-directory`
+* `--report-dir`, `--report-directory`
 * `--report-filename`
 * `--report-on-fatalerror`
 * `--report-on-signal`
diff --git a/doc/node.1 b/doc/node.1
index 6eeb2ed3fd3338..9ce881301a7641 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -291,7 +291,7 @@ Write
 .Sy diagnostic reports
 in a compact format, single-line JSON.
 .
-.It Fl -report-directory Fl -report-dir
+.It Fl -report-dir Fl -report-directory
 Location at which the
 .Sy diagnostic report
 will be generated.
diff --git a/src/node_options.cc b/src/node_options.cc
index 894956cc171e95..d5346f75fc156c 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -665,12 +665,12 @@ PerProcessOptionsParser::PerProcessOptionsParser(
             "output compact single-line JSON",
             &PerProcessOptions::report_compact,
             kAllowedInEnvironment);
-  AddOption("--report-directory",
+  AddOption("--report-dir",
             "define custom report pathname."
             " (default: current working directory)",
             &PerProcessOptions::report_directory,
             kAllowedInEnvironment);
-  AddAlias("--report-dir", "--report-directory");
+  AddAlias("--report-directory", "--report-dir");
   AddOption("--report-filename",
             "define custom report file name."
             " (default: YYYYMMDD.HHMMSS.PID.SEQUENCE#.txt)",