hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix home path issue on some linux build

Browse Source
This commit is contained in:
rustdesk 2021-05-21 19:11:09 +08:00
parent 9a4786adb2
commit b7ab1405ee
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/hbb_common/src/config.rs
View File

@ -148,6 +148,17 @@ fn patch(path: PathBuf) -> PathBuf {
.into(); .into();
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
return _tmp.replace("Application Support", "Preferences").into(); return _tmp.replace("Application Support", "Preferences").into();
#[cfg(target_os = "linux")]
{
if _tmp == "/root" {
if let Ok(output) = std::process::Command::new("whoami").output() {
let user = String::from_utf8_lossy(&output.stdout).to_string().trim().to_owned();
if user != "root" {
return format!("/home/{}", user).into();
}
}
}
}
} }
path path
} }
@ -269,11 +280,10 @@ impl Config {
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
{ {
if let Some(path) = dirs_next::home_dir().as_mut() { let mut path = Self::get_home();
path.push(format!(".local/share/logs/{}", APP_NAME)); path.push(format!(".local/share/logs/{}", APP_NAME));
std::fs::create_dir_all(&path).ok(); std::fs::create_dir_all(&path).ok();
return path.clone(); return path;
}
} }
if let Some(path) = Self::path("").parent() { if let Some(path) = Self::path("").parent() {
let mut path: PathBuf = path.into(); let mut path: PathBuf = path.into();