Fixed linting

pull/2067/head
Joel 8 months ago
parent e7d55ac7ed
commit cc3bc6ca25

@ -840,9 +840,15 @@ impl Update {
/// MacOS /// MacOS
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
impl Update { impl Update {
/// ### Expected structure:
/// ├── [AppName]_[version]_x64.app.tar.gz # GZ generated by tauri-bundler
/// │ └──[AppName].app # Main application
/// │ └── Contents # Application contents...
/// │ └── ...
/// └── ...
fn install_inner(&self, bytes: &[u8]) -> Result<()> { fn install_inner(&self, bytes: &[u8]) -> Result<()> {
use flate2::read::GzDecoder; use flate2::read::GzDecoder;
let cursor = Cursor::new(bytes); let cursor = Cursor::new(bytes);
let mut extracted_files: Vec<PathBuf> = Vec::new(); let mut extracted_files: Vec<PathBuf> = Vec::new();
@ -850,7 +856,7 @@ impl Update {
let tmp_backup_dir = tempfile::Builder::new() let tmp_backup_dir = tempfile::Builder::new()
.prefix("tauri_current_app") .prefix("tauri_current_app")
.tempdir()?; .tempdir()?;
let tmp_extract_dir = tempfile::Builder::new() let tmp_extract_dir = tempfile::Builder::new()
.prefix("tauri_updated_app") .prefix("tauri_updated_app")
.tempdir()?; .tempdir()?;
@ -878,7 +884,10 @@ impl Update {
} }
// Try to move the current app to backup // Try to move the current app to backup
let move_result = std::fs::rename(&self.extract_path, tmp_backup_dir.path().join("current_app")); let move_result = std::fs::rename(
&self.extract_path,
tmp_backup_dir.path().join("current_app"),
);
let need_authorization = if let Err(err) = move_result { let need_authorization = if let Err(err) = move_result {
if err.kind() == std::io::ErrorKind::PermissionDenied { if err.kind() == std::io::ErrorKind::PermissionDenied {
true true
@ -897,10 +906,10 @@ impl Update {
src = self.extract_path.display(), src = self.extract_path.display(),
new = tmp_extract_dir.path().display() new = tmp_extract_dir.path().display()
); );
let mut osascript = std::process::Command::new("osascript"); let mut osascript = std::process::Command::new("osascript");
osascript.arg("-e").arg(script); osascript.arg("-e").arg(script);
let status = osascript.status()?; let status = osascript.status()?;
if !status.success() { if !status.success() {
std::fs::remove_dir_all(tmp_extract_dir.path()).ok(); std::fs::remove_dir_all(tmp_extract_dir.path()).ok();

Loading…
Cancel
Save