From 3ae808986d583ab4e151a7799acee4680c66bd78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Fri, 26 Jul 2019 09:36:56 +0200
Subject: [PATCH] cli: unify deno -h options (#2682)

---
 cli/flags.rs      |  2 +-
 website/manual.md | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/cli/flags.rs b/cli/flags.rs
index 535ed500..0a6b353f 100644
--- a/cli/flags.rs
+++ b/cli/flags.rs
@@ -116,7 +116,7 @@ Examples: https://github.com/WICG/import-maps#the-import-map",
 pub fn create_cli_app<'a, 'b>() -> App<'a, 'b> {
   add_run_args(App::new("deno"))
     .bin_name("deno")
-    .global_settings(&[AppSettings::ColorNever])
+    .global_settings(&[AppSettings::ColorNever, AppSettings::UnifiedHelpMessage])
     .settings(&[AppSettings::DisableVersion, AppSettings::AllowExternalSubcommands])
     .after_help(ENV_VARIABLES_HELP)
     .long_about("A secure runtime for JavaScript and TypeScript built with V8, Rust, and Tokio.
diff --git a/website/manual.md b/website/manual.md
index 9d2b6045..b29311b1 100644
--- a/website/manual.md
+++ b/website/manual.md
@@ -599,27 +599,26 @@ Use `deno help` to see the help text.
 
 ```
 USAGE:
-    deno [FLAGS] [OPTIONS] [SUBCOMMAND]
-
-FLAGS:
-    -A, --allow-all       Allow all permissions
-        --allow-env       Allow environment access
-        --allow-hrtime    Allow high resolution time measurement
-        --allow-run       Allow running subprocesses
-    -h, --help            Prints help information
-        --no-prompt       Do not use prompts
-    -r, --reload          Reload source code cache (recompile TypeScript)
-        --v8-options      Print V8 command line options
+    deno [OPTIONS] [SUBCOMMAND]
 
 OPTIONS:
+    -A, --allow-all                    Allow all permissions
+        --allow-env                    Allow environment access
+        --allow-hrtime                 Allow high resolution time measurement
         --allow-net=<allow-net>        Allow network access
         --allow-read=<allow-read>      Allow file system read access
+        --allow-run                    Allow running subprocesses
         --allow-write=<allow-write>    Allow file system write access
     -c, --config <FILE>                Load compiler configuration file
+    -h, --help                         Prints help information
         --importmap <FILE>             Load import map file
     -L, --log-level <log-level>        Set log level [possible values: debug, info]
+        --no-fetch                     Do not download remote modules
+        --no-prompt                    Do not use prompts
+    -r, --reload                       Reload source code cache (recompile TypeScript)
         --seed <NUMBER>                Seed Math.random()
         --v8-flags=<v8-flags>          Set V8 command line options
+        --v8-options                   Print V8 command line options
 
 SUBCOMMANDS:
     [SCRIPT]       Script to run
-- 
GitLab