show: add dune show env and make dune printenv an alias of it

Signed-off-by: Ali Caglayan <alizter@gmail.com>
ocaml · Jun 16, 2023 · 0465cd9 · 0465cd9
1 parent 761395b
commit 0465cd9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/bin/describe/describe.ml b/bin/describe/describe.ml
@@ -12,6 +12,7 @@ let subcommands =
   ; Describe_external_lib_deps.command
   ; Describe_opam_files.command
   ; Describe_pp.command
+  ; Printenv.command
   ]
 
 let group =

diff --git a/bin/main.ml b/bin/main.ml
@@ -17,7 +17,7 @@ let all : _ Cmdliner.Cmd.t list =
     ; Print_rules.command
     ; Utop.command
     ; Promotion.promote
-    ; Printenv.command
+    ; command_alias Printenv.command Printenv.term "printenv"
     ; Help.command
     ; Format_dune_file.command
     ; Upgrade.command

diff --git a/bin/printenv.ml b/bin/printenv.ml
@@ -1,16 +1,6 @@
 open Stdune
 open Import
 
-let doc = "Print the environment of a directory"
-
-let man =
-  [ `S "DESCRIPTION"
-  ; `P {|$(b,dune printenv DIR) prints the environment of a directory|}
-  ; `Blocks Common.help_secs
-  ]
-
-let info = Cmd.info "printenv" ~doc ~man
-
 let dump sctx ~dir =
   let open Action_builder.O in
   let+ env = Super_context.dump_env sctx ~dir in
@@ -88,4 +78,12 @@ let term =
               (Dune_engine.Context_name.to_string name)
               (pp ~fields) env))
 
-let command = Cmd.v info term
+let command =
+  let doc = "Print the environment of a directory" in
+  let man =
+    [ `S "DESCRIPTION"
+    ; `P {|$(b,dune show env DIR) prints the environment of a directory|}
+    ; `Blocks Common.help_secs
+    ]
+  in
+  Cmd.v (Cmd.info "env" ~doc ~man) term
diff --git a/bin/printenv.mli b/bin/printenv.mli
@@ -1,3 +1,5 @@
 open Import
 
+val term : unit Term.t
+
 val command : unit Cmd.t