From f1b316dc5f04ea8e8807c178baf5858ca6a58e6e Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Mon, 7 Oct 2024 11:29:33 +0200 Subject: [PATCH 1/2] Agnostic_baker: move --help function --- src/bin_agnostic_baker/main_agnostic_baker.ml | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/bin_agnostic_baker/main_agnostic_baker.ml b/src/bin_agnostic_baker/main_agnostic_baker.ml index c50e2d66888b..3363d659d6f9 100644 --- a/src/bin_agnostic_baker/main_agnostic_baker.ml +++ b/src/bin_agnostic_baker/main_agnostic_baker.ml @@ -320,20 +320,23 @@ module Args = struct let help_arg = "--help" + let print_help () = + Format.printf + "Usage:\n\ + \ octez-agnostic-baker [OCTEZ-AGNOSTIC-BAKER-COMMANDS] -- \ + [OCTEZ-BAKER-COMMANDS]@.@." ; + Format.printf + "OCTEZ-AGNOSTIC-BAKER-COMMANDS:\n\ + \ %s: display help\n\ + \ %s: path to the octez-baker binaries@.@." + help_arg + binaries_directory_arg ; + Format.printf + "OCTEZ-BAKER-COMMANDS:\n Run ./octez-baker- --help@." + let help_cmd args = if List.mem ~equal:String.equal help_arg args then ( - Format.printf - "Usage:\n\ - \ octez-agnostic-baker [OCTEZ-AGNOSTIC-BAKER-COMMANDS] -- \ - [OCTEZ-BAKER-COMMANDS]@.@." ; - Format.printf - "OCTEZ-AGNOSTIC-BAKER-COMMANDS:\n\ - \ %s: display help\n\ - \ %s: path to the octez-baker binaries@.@." - help_arg - binaries_directory_arg ; - Format.printf - "OCTEZ-BAKER-COMMANDS:\n Run ./octez-baker- --help@." ; + print_help () ; exit 0) else () -- GitLab From 9d8d86f93edc166f5a815f780421e3507f114e65 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Mon, 7 Oct 2024 11:35:18 +0200 Subject: [PATCH 2/2] Agnostic_baker: prevent from running baker without any arguments --- src/bin_agnostic_baker/main_agnostic_baker.ml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/bin_agnostic_baker/main_agnostic_baker.ml b/src/bin_agnostic_baker/main_agnostic_baker.ml index 3363d659d6f9..0eff8e453138 100644 --- a/src/bin_agnostic_baker/main_agnostic_baker.ml +++ b/src/bin_agnostic_baker/main_agnostic_baker.ml @@ -367,6 +367,14 @@ module Args = struct let get_binaries_directory = get_arg_value ~arg:binaries_directory_arg + let fail_on_empty_baker_args baker_args = + if List.is_empty baker_args then ( + Format.eprintf + "Cannot run agnostic baker without any baker arguments. Please refer \ + to the following help:@." ; + print_help () ; + exit 1) + let parse_args all_args = let all_args = Array.to_list all_args in (* Specific vesrion case *) @@ -375,6 +383,7 @@ module Args = struct let all_args = Option.value ~default:[] (List.tl all_args) in (* Split agnostic baker and baker arguments, that aims to be delimited by -- *) let agnostic_baker_args, baker_args = split_args all_args in + let () = fail_on_empty_baker_args baker_args in let () = help_cmd agnostic_baker_args in let endpoint = Option.value -- GitLab