From 40919be3f78cef1418ced1769d8c72af185155e5 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sun, 6 Nov 2022 19:02:37 +0100 Subject: [PATCH] sop decrypt: rename --verify-out to --verifications-out --verify-out is still available as an alias. See https://gitlab.com/dkg/openpgp-stateless-cli/-/issues/55 --- .../src/main/java/sop/cli/picocli/commands/DecryptCmd.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DecryptCmd.java b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DecryptCmd.java index 0b309bc..08c8d22 100644 --- a/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DecryptCmd.java +++ b/sop-java-picocli/src/main/java/sop/cli/picocli/commands/DecryptCmd.java @@ -33,7 +33,7 @@ public class DecryptCmd extends AbstractSopCmd { private static final String OPT_NOT_BEFORE = "--not-before"; private static final String OPT_NOT_AFTER = "--not-after"; private static final String OPT_SESSION_KEY_OUT = "--session-key-out"; - private static final String OPT_VERIFY_OUT = "--verify-out"; + private static final String OPT_VERIFICATIONS_OUT = "--verifications-out"; private static final String OPT_VERIFY_WITH = "--verify-with"; private static final String OPT_WITH_KEY_PASSWORD = "--with-key-password"; @@ -53,7 +53,7 @@ public class DecryptCmd extends AbstractSopCmd { paramLabel = "PASSWORD") List withPassword = new ArrayList<>(); - @CommandLine.Option(names = {OPT_VERIFY_OUT}, + @CommandLine.Option(names = {OPT_VERIFICATIONS_OUT, "--verify-out"}, // TODO: Remove --verify-out at some point paramLabel = "VERIFICATIONS") String verifyOut; @@ -94,7 +94,7 @@ public class DecryptCmd extends AbstractSopCmd { setDecryptWith(keys, decrypt); if (verifyOut != null && certs.isEmpty()) { - String errorMsg = getMsg("sop.error.usage.option_requires_other_option", OPT_VERIFY_OUT, OPT_VERIFY_WITH); + String errorMsg = getMsg("sop.error.usage.option_requires_other_option", OPT_VERIFICATIONS_OUT, OPT_VERIFY_WITH); throw new SOPGPException.IncompleteVerification(errorMsg); }