From fb50295e82cf677adbcd93c9791d9132b903bc18 Mon Sep 17 00:00:00 2001 From: EliteAsian <29520859+EliteAsian123@users.noreply.github.com> Date: Wed, 12 Jul 2023 11:56:32 -0400 Subject: [PATCH] Fixed compile errors on non-linux platforms --- src-tauri/src/main.rs | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index c2e41dc..c0582fa 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -6,7 +6,6 @@ mod utils; use directories::BaseDirs; use minisign::{PublicKeyBox, SignatureBox}; use std::fs::{self, remove_file}; -use std::os::unix::prelude::PermissionsExt; use std::path::{Path, PathBuf}; use std::process::Command; use std::{fs::File, io::Write}; @@ -203,16 +202,28 @@ impl InnerState { let _ = remove_file(&zip_path); // Change permissions (if on Linux) - if cfg!(target_os = "linux") { - let exec = self.get_yarg_exec(version_id, profile)?; - - let mut perms = fs::metadata(&exec) - .map_err(|e| format!("Failed to get permissions of file.\n{:?}", e))? - .permissions(); - perms.set_mode(0o7111); - fs::set_permissions(&exec, perms) - .map_err(|e| format!("Failed to set permissions of file.\n{:?}", e))?; - } + self.set_permissions(version_id, profile)?; + + Ok(()) + } + + #[cfg(not(target_os = "linux"))] + fn set_permissions(&self, _a: String, _b: String) -> Result<(), String> { + Ok(()) + } + + #[cfg(target_os = "linux")] + fn set_permissions(&self, version_id: String, profile: String) -> Result<(), String> { + use std::os::unix::prelude::PermissionsExt; + + let exec = self.get_yarg_exec(version_id, profile)?; + + let mut perms = fs::metadata(&exec) + .map_err(|e| format!("Failed to get permissions of file.\n{:?}", e))? + .permissions(); + perms.set_mode(0o7111); + fs::set_permissions(&exec, perms) + .map_err(|e| format!("Failed to set permissions of file.\n{:?}", e))?; Ok(()) }