daxi20/acmeclient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show help when --help is included, not only if parsing fails and then --help is included

Browse Source
This commit is contained in:
Niklas Keller
2016-03-28 12:27:02 +02:00
parent 866b172c5f
commit fb0509ae7e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/acme
View File

@@ -105,22 +105,23 @@ try {
unset($args[1]); unset($args[1]);
$climate->arguments->add($definition); $climate->arguments->add($definition);
$climate->arguments->parse(array_values($args));
} catch (Exception $e) {
if (count($argv) === 3 && in_array($argv[2], ["h", "-h", "--help", "help"], true)) { if (count($argv) === 3 && in_array($argv[2], ["h", "-h", "--help", "help"], true)) {
$climate->usage(["{$binary} {$argv[1]}"]); $climate->usage(["{$binary} {$argv[1]}"]);
$climate->br(); $climate->br();
exit(0); exit(0);
} else { } else {
$climate->usage(["{$binary} {$argv[1]}"]); $climate->arguments->parse(array_values($args));
$climate->br();
$climate->error($e->getMessage());
$climate->br();
exit(1);
} }
} catch (Exception $e) {
$climate->usage(["{$binary} {$argv[1]}"]);
$climate->br();
$climate->error($e->getMessage());
$climate->br();
exit(1);
} }
$injector = new Injector; $injector = new Injector;