Rename environment variables to override cert and key store.

- This makes them more consistent with the other environment
    variables SEQUOIA_HOME and SEQUOIA_CRYPTO_POLICY.

  - Fixes #364.
This commit is contained in:
Justus Winter
2024-10-08 15:30:46 +02:00
parent 907a16caa2
commit 6517b63378
3 changed files with 9 additions and 5 deletions

4
NEWS
View File

@ -36,6 +36,10 @@
- The arguments to name recipients for encryption now use the
`--for` prefix, as in `sq encrypt --for-email alice@example.org`.
Further, `--recipient-cert` is now just called `--for`
- The environment variables to override the default cert store and
key store location have been renamed from SQ_CERT_STORE to
SEQUOIA_CERT_STORE, and SQ_KEY_STORE to SEQUOIA_KEY_STORE,
respectively.
* Changes in 0.38.0
** Notable changes
- New subcommand `sq key subkey delete` to delete secret key

View File

@ -199,8 +199,8 @@ macro_rules! test_examples {
cmd.current_dir(&tmp_dir)
.env("SEQUOIA_CRYPTO_POLICY", &policy)
.env("SEQUOIA_HOME", &home)
.env("SQ_CERT_STORE", &cert_store)
.env("SQ_KEY_STORE", &key_store)
.env("SEQUOIA_CERT_STORE", &cert_store)
.env("SEQUOIA_KEY_STORE", &key_store)
.arg("--batch")
.args(&command[1..]);

View File

@ -281,7 +281,7 @@ key store."
#[clap(
long,
value_name = "PATH",
env = "SQ_KEY_STORE",
env = "SEQUOIA_KEY_STORE",
conflicts_with_all = &[ "no_key_store" ],
global = true,
help_heading = GLOBAL_OPTIONS_HEADER,
@ -326,7 +326,7 @@ standard cert-d, which is located in `$HOME/.local/share/pgp.cert.d`."
#[clap(
long,
value_name = "PATH",
env = "SQ_CERT_STORE",
env = "SEQUOIA_CERT_STORE",
conflicts_with_all = &[ "no_cert_store" ],
global = true,
help_heading = GLOBAL_OPTIONS_HEADER,
@ -335,7 +335,7 @@ standard cert-d, which is located in `$HOME/.local/share/pgp.cert.d`."
Specify the location of the certificate store. By default, `sq` uses \
the OpenPGP certificate directory in Sequoia's home directory (see `--home`), \
{}. This can be overridden by setting the `PGP_CERT_D` environment \
variable. That in turn can be overridden by setting the `SQ_CERT_STORE` \
variable. That in turn can be overridden by setting the `SEQUOIA_CERT_STORE` \
environment variable.",
sequoia_directories::Home::default()
.map(|home| {