From a9cc34e70fce4cec3b2cd902bf27b6fe3a55c7f7 Mon Sep 17 00:00:00 2001 From: amrbashir Date: Thu, 1 Feb 2024 21:28:24 +0200 Subject: [PATCH] remove env var from docs --- tooling/cli/ENVIRONMENT_VARIABLES.md | 1 - tooling/cli/src/build.rs | 2 +- tooling/cli/src/signer/generate.rs | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tooling/cli/ENVIRONMENT_VARIABLES.md b/tooling/cli/ENVIRONMENT_VARIABLES.md index 2b18c67364a0..98d6640673b4 100644 --- a/tooling/cli/ENVIRONMENT_VARIABLES.md +++ b/tooling/cli/ENVIRONMENT_VARIABLES.md @@ -16,7 +16,6 @@ These environment variables are inputs to the CLI which may have an equivalent C - `TAURI_LINUX_AYATANA_APPINDICATOR` — Set this var to `true` or `1` to force usage of `libayatana-appindicator` for system tray on Linux. - `TAURI_BUNDLER_WIX_FIPS_COMPLIANT` — Specify the bundler's WiX `FipsCompliant` option. - `TAURI_SKIP_SIDECAR_SIGNATURE_CHECK` - Skip signing sidecars. -- `TAURI_SIGNING_PUBLIC_KEY` — Public key used to sign your app bundles, can be either a string or a path to the file. - `TAURI_SIGNING_PRIVATE_KEY` — Private key used to sign your app bundles, can be either a string or a path to the file. - `TAURI_SIGNING_PRIVATE_KEY_PASSWORD` — The signing private key password, see `TAURI_SIGNING_PRIVATE_KEY`. - `TAURI_SIGNING_RPM_KEY` — The private GPG key used to sign the RPM bundle, exported to its ASCII-armored format. diff --git a/tooling/cli/src/build.rs b/tooling/cli/src/build.rs index 78696756f29e..f3921697d628 100644 --- a/tooling/cli/src/build.rs +++ b/tooling/cli/src/build.rs @@ -241,7 +241,7 @@ pub fn command(mut options: Options, verbosity: u8) -> Result<()> { let (signature_path, signature) = sign_file(&secret_key, path)?; if signature.keynum() != public_key.keynum() { log::warn!( - "The updater secret key from `TAURI_PRIVATE_KEY` does not match the public key from `TAURI_SIGNING_PUBLIC_KEY`. If you are not rotating keys, this means your configuration is wrong and won't be accepted at runtime when performing update." + "The updater secret key from `TAURI_PRIVATE_KEY` does not match the public key from `plugins > updater > pubkey`. If you are not rotating keys, this means your configuration is wrong and won't be accepted at runtime when performing update." ); } signed_paths.push(signature_path); diff --git a/tooling/cli/src/signer/generate.rs b/tooling/cli/src/signer/generate.rs index 388efd21a93b..8bc3e9bcf9b4 100644 --- a/tooling/cli/src/signer/generate.rs +++ b/tooling/cli/src/signer/generate.rs @@ -58,7 +58,6 @@ pub fn command(mut options: Options) -> Result<()> { } println!("\nEnvironment variables used to sign:"); - println!("`TAURI_SIGNING_PUBLIC_KEY` Path or String of your public key"); println!("`TAURI_SIGNING_PRIVATE_KEY` Path or String of your private key"); println!("`TAURI_SIGNING_PRIVATE_KEY_PASSWORD` Your private key password (optional)"); println!("\nATTENTION: If you lose your private key OR password, you'll not be able to sign your update package and updates will not work.\n---------------------------\n");