From baaf248ae130ebf9aa9d35c6d66f7e2180d5d061 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 6 Oct 2019 18:30:52 -0500 Subject: validator: Use clipp, add -k/--keep-going flag --- tools/hscript-validate/validator.cc | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/hscript-validate/validator.cc b/tools/hscript-validate/validator.cc index e9e1979..5ebb9d4 100644 --- a/tools/hscript-validate/validator.cc +++ b/tools/hscript-validate/validator.cc @@ -11,14 +11,23 @@ #include "hscript/script.hh" #include "util/output.hh" +#include "3rdparty/clipp.h" int main(int argc, char *argv[]) { const Horizon::Script *my_script; Horizon::ScriptOptions opts; + int result_code = EXIT_SUCCESS; + std::string installfile; - if(argc < 2) { - output_error("hscript-validate", "No installfile specified", "", true); - std::cerr << "Run `" << argv[0] << " --help` for usage information." << std::endl; + auto cli = ( + clipp::value("installfile", installfile), + clipp::option("-k", "--keep-going").doc("Continue parsing after errors")( + [&opts] { opts.set(Horizon::ScriptOptionFlags::KeepGoing); } + ) + ); + if(!clipp::parse(argc, argv, cli)) { + std::cout << "usage:" << std::endl; + std::cout << clipp::usage_lines(cli, "hscript-validate") << std::endl; return EXIT_FAILURE; } @@ -28,12 +37,19 @@ int main(int argc, char *argv[]) { opts.set(Horizon::ScriptOptionFlags::Pretty); - my_script = Horizon::Script::load(argv[1], opts); + my_script = Horizon::Script::load(installfile, opts); if(my_script == nullptr) { std::cout << "Could not load the specified script." << std::endl; return EXIT_FAILURE; } - delete my_script; - return EXIT_SUCCESS; + if(!my_script->validate()) { + output_error("installfile", "Script failed validation step. Stop.", "", true); + result_code = EXIT_FAILURE; + } else { + output_info("installfile", "Script passed validation.", "", true); + } + + delete my_script; + return result_code; } -- cgit v1.2.3-60-g2f50