Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "endfield-cat",
"private": true,
"version": "0.2.0",
"version": "0.2.1-pre.6988de34.ac631d6",
"type": "module",
"engines": {
"node": ">=24 <25"
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "endfield-cat"
version = "0.2.0"
version = "0.2.1-pre.6988de34.ac631d6"
description = "A Tauri App"
authors = ["you"]
edition = "2021"
Expand Down
40 changes: 38 additions & 2 deletions src-tauri/src/services/update.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ pub fn prepare_paths(exe_name: &std::ffi::OsStr) -> Result<UpdatePaths, String>
let new_exe = temp_dir.join(exe_name);
let batch_path = temp_dir.join("updater.bat");

Ok(UpdatePaths { temp_dir, new_exe, batch_path })
Ok(UpdatePaths {
temp_dir,
new_exe,
batch_path,
})
}

pub async fn download_new_exe<F>(
Expand Down Expand Up @@ -101,7 +105,7 @@ echo 启动新版本...
start "" /min "{current_exe}"

echo 清理临时文件...
start "" /min cmd /c "timeout /t 3 /nobreak >nul & if exist \"{temp_dir}\" rd /s /q \"{temp_dir}\""
start "" /min powershell -NoProfile -ExecutionPolicy Bypass -Command "param([string]$p) Start-Sleep -Seconds 3; if (Test-Path -LiteralPath $p) {{ Remove-Item -LiteralPath $p -Recurse -Force }}" "{temp_dir}"

exit /b 0
"#,
Expand All @@ -113,3 +117,35 @@ exit /b 0

batch_content.replace('\n', "\r\n")
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn build_updater_batch_uses_powershell_literalpath_cleanup() {
let content = build_updater_batch(
"endfield-cat.exe",
Path::new("C:\\Temp\\endfield-cat-update\\new.exe"),
Path::new("C:\\Program Files\\EndCat\\endfield-cat.exe"),
Path::new("C:\\Temp\\endfield-cat-update"),
);

// In cmd.exe, `\"` is not an escape; it can break parsing and lead to paths like `\\`.
assert!(!content.contains("\\\""));
assert!(content.contains(r#"powershell -NoProfile -ExecutionPolicy Bypass -Command "param([string]$p) Start-Sleep -Seconds 3; if (Test-Path -LiteralPath $p) { Remove-Item -LiteralPath $p -Recurse -Force }""#));
assert!(content.contains(r#""C:\Temp\endfield-cat-update""#));
}

#[test]
fn build_updater_batch_cleanup_quotes_ampersand_path() {
let content = build_updater_batch(
"endfield-cat.exe",
Path::new("C:\\Temp\\endfield-cat-update\\new.exe"),
Path::new("C:\\Program Files\\EndCat\\endfield-cat.exe"),
Path::new("C:\\Temp\\A&B\\endfield-cat-update"),
);

assert!(content.contains(r#""C:\Temp\A&B\endfield-cat-update""#));
}
}
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "endfield-cat",
"version": "0.2.0",
"version": "0.2.1-pre.6988de34.ac631d6",
"identifier": "org.boxcat.endfield-cat",
"build": {
"beforeDevCommand": "yarn dev",
Expand Down
Loading