From d19489031536bc4a337b268524d09a9a0d4159fa Mon Sep 17 00:00:00 2001 From: Ku6epXBOCTuK Date: Mon, 7 Sep 2026 02:46:44 +0500 Subject: [PATCH] fix: rename env variables (remained after the project was renamed) --- README.md | 6 +++--- src/config.rs | 4 ++-- src/deploy.rs | 10 +++++----- src/local.rs | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 060a13c..6004633 100644 --- a/README.md +++ b/README.md @@ -107,14 +107,14 @@ remote.commands = ["pm2 restart pages"] [projects.my-node-app.local_after] commands = [ 'del /q dist', - 'curl -s -X POST https://example.com/hook -d "result=%XBP_DEPLOY_RESULT%"', + 'curl -s -X POST https://example.com/hook -d "result=%XD_DEPLOY_RESULT%"', ] ``` Внутри доступны переменные (в cmd — `%VAR%`, в sh — `$VAR`): -- `XBP_DEPLOY_RESULT` — `success` либо `failed`; -- `XBP_ERROR` — текст ошибки (только при `failed`). +- `XD_DEPLOY_RESULT` — `success` либо `failed`; +- `XD_ERROR` — текст ошибки (только при `failed`). Эти же переменные доступны в `--dry-run`, где показываются в плане без выполнения. diff --git a/src/config.rs b/src/config.rs index 3fdbbaf..d384aaa 100644 --- a/src/config.rs +++ b/src/config.rs @@ -381,7 +381,7 @@ hostt = "typo" host = "10.0.0.9" port = 2327 user = "deploy" -key_path = "~/.ssh/xbp_key" +key_path = "~/.ssh/xd_key" [projects.web] workdir = "." @@ -401,7 +401,7 @@ port = 2222 assert_eq!(web.port, Some(2327)); assert_eq!(web.user.as_deref(), Some("deploy")); let key = web.key_path.as_ref().unwrap(); - assert!(key.ends_with("xbp_key"), "{}", key.display()); + assert!(key.ends_with("xd_key"), "{}", key.display()); } #[test] diff --git a/src/deploy.rs b/src/deploy.rs index 0907769..617bb93 100644 --- a/src/deploy.rs +++ b/src/deploy.rs @@ -132,11 +132,11 @@ fn run_local_after(project: &Project, primary: &Result<()>) -> Result<()> { let mut env = project.env.clone(); match primary { Ok(()) => { - env.insert("XBP_DEPLOY_RESULT".to_string(), "success".to_string()); + env.insert("XD_DEPLOY_RESULT".to_string(), "success".to_string()); } Err(err) => { - env.insert("XBP_DEPLOY_RESULT".to_string(), "failed".to_string()); - env.insert("XBP_ERROR".to_string(), format!("{err:#}")); + env.insert("XD_DEPLOY_RESULT".to_string(), "failed".to_string()); + env.insert("XD_ERROR".to_string(), format!("{err:#}")); } } for cmd in &cmds.commands { @@ -315,9 +315,9 @@ mod tests { fn result_echo_cmd(out: &Path) -> String { if cfg!(windows) { - format!("echo %XBP_DEPLOY_RESULT%> {}", out.display()) + format!("echo %XD_DEPLOY_RESULT%> {}", out.display()) } else { - format!("echo $XBP_DEPLOY_RESULT > {}", out.display()) + format!("echo $XD_DEPLOY_RESULT > {}", out.display()) } } diff --git a/src/local.rs b/src/local.rs index 895e688..2e54a1f 100644 --- a/src/local.rs +++ b/src/local.rs @@ -212,11 +212,11 @@ mod tests { fn env_vars_visible_inside_local_commands() { let workdir = tmpdir("dotenv-exec"); let echo_var = if cfg!(windows) { - "echo %XBP_TEST_VAR%" + "echo %XD_TEST_VAR%" } else { - "echo $XBP_TEST_VAR" + "echo $XD_TEST_VAR" }; - fs::write(workdir.join(".env"), "XBP_TEST_VAR=hello-env\n").unwrap(); + fs::write(workdir.join(".env"), "XD_TEST_VAR=hello-env\n").unwrap(); let mut command = shell_command(echo_var); command.current_dir(&workdir); for (k, v) in load_dotenv(&workdir).unwrap() { @@ -233,13 +233,13 @@ mod tests { fn config_env_overrides_dotenv() { let workdir = tmpdir("dotenv-precedence"); let echo_var = if cfg!(windows) { - "echo %XBP_P_VAR%" + "echo %XD_P_VAR%" } else { - "echo $XBP_P_VAR" + "echo $XD_P_VAR" }; - fs::write(workdir.join(".env"), "XBP_P_VAR=from-dotenv\n").unwrap(); + fs::write(workdir.join(".env"), "XD_P_VAR=from-dotenv\n").unwrap(); let mut extra = BTreeMap::new(); - extra.insert("XBP_P_VAR".to_string(), "from-config".to_string()); + extra.insert("XD_P_VAR".to_string(), "from-config".to_string()); let mut command = shell_command(echo_var); command.current_dir(&workdir); for (k, v) in load_dotenv(&workdir).unwrap() {