ksud: extract binaries properly (#1253)

This commit is contained in:
5ec1cff
2024-01-05 23:31:52 +08:00
committed by GitHub
parent faf7a8e3b1
commit 30e00859b9
2 changed files with 10 additions and 3 deletions

View File

@@ -330,7 +330,7 @@ fn _install_module(zip: &str) -> Result<()> {
// print banner
println!(include_str!("banner"));
assets::ensure_binaries(true).with_context(|| "Failed to extract assets")?;
assets::ensure_binaries(false).with_context(|| "Failed to extract assets")?;
// first check if workding dir is usable
ensure_dir_exists(defs::WORKING_DIR).with_context(|| "Failed to create working dir")?;

View File

@@ -1,7 +1,7 @@
use anyhow::{bail, Context, Error, Ok, Result};
use std::{
fs::{create_dir_all, write, File, OpenOptions},
io::{ErrorKind::AlreadyExists, Write},
fs::{create_dir_all, remove_file, write, File, OpenOptions},
io::{ErrorKind::AlreadyExists, ErrorKind::NotFound, Write},
path::Path,
};
@@ -63,6 +63,13 @@ pub fn ensure_binary<T: AsRef<Path>>(
)
})?)?;
if let Err(e) = remove_file(path.as_ref()) {
if e.kind() != NotFound {
return Err(Error::from(e))
.with_context(|| format!("failed to unlink {}", path.as_ref().display()));
}
}
write(&path, contents)?;
#[cfg(unix)]
set_permissions(&path, Permissions::from_mode(0o755))?;