Show endOfOptions delimiter in help

This commit is contained in:
Paul Schaub 2024-09-19 18:25:03 +02:00
parent 54782d2a22
commit 3367450f94
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 4 additions and 6 deletions

View file

@ -6,10 +6,8 @@ package sop.cli.picocli.commands
import java.io.IOException import java.io.IOException
import picocli.CommandLine.Command import picocli.CommandLine.Command
import picocli.CommandLine.Model.CommandSpec
import picocli.CommandLine.Option import picocli.CommandLine.Option
import picocli.CommandLine.Parameters import picocli.CommandLine.Parameters
import picocli.CommandLine.Spec
import sop.cli.picocli.SopCLI import sop.cli.picocli.SopCLI
import sop.exception.SOPGPException.BadData import sop.exception.SOPGPException.BadData
import sop.exception.SOPGPException.UnsupportedOption import sop.exception.SOPGPException.UnsupportedOption
@ -17,11 +15,10 @@ import sop.exception.SOPGPException.UnsupportedOption
@Command( @Command(
name = "certify-userid", name = "certify-userid",
resourceBundle = "msg_certify-userid", resourceBundle = "msg_certify-userid",
exitCodeOnInvalidInput = UnsupportedOption.EXIT_CODE) exitCodeOnInvalidInput = UnsupportedOption.EXIT_CODE,
showEndOfOptionsDelimiterInUsageHelp = true)
class CertifyUserIdCmd : AbstractSopCmd() { class CertifyUserIdCmd : AbstractSopCmd() {
@Spec var spec: CommandSpec? = null
@Option(names = ["--no-armor"], negatable = true) var armor = true @Option(names = ["--no-armor"], negatable = true) var armor = true
@Option(names = ["--userid"], required = true, arity = "1..*", paramLabel = "USERID") @Option(names = ["--userid"], required = true, arity = "1..*", paramLabel = "USERID")

View file

@ -15,7 +15,8 @@ import sop.util.HexUtil.Companion.bytesToHex
@Command( @Command(
name = "validate-userid", name = "validate-userid",
resourceBundle = "msg_validate-userid", resourceBundle = "msg_validate-userid",
exitCodeOnInvalidInput = SOPGPException.MissingArg.EXIT_CODE) exitCodeOnInvalidInput = SOPGPException.MissingArg.EXIT_CODE,
showEndOfOptionsDelimiterInUsageHelp = true)
class ValidateUserIdCmd : AbstractSopCmd() { class ValidateUserIdCmd : AbstractSopCmd() {
@Option(names = ["--addr-spec-only"]) var addrSpecOnly: Boolean = false @Option(names = ["--addr-spec-only"]) var addrSpecOnly: Boolean = false