Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ElXreno/proper-assets-path-finding' into 'master'

Browse Source 
Find assets by using other environment variables

See merge request veloren/veloren!912
This commit is contained in:
Songtronix 2020-04-15 10:38:00 +00:00
commit 866cfa3a8f
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/assets/mod.rs
View File

@ -297,7 +297,23 @@ lazy_static! {
// System paths
#[cfg(target_os = "linux")]
paths.push("/usr/share/veloren/assets".into());
{
if let Ok(result) = std::env::var("XDG_DATA_HOME") {
paths.push(format!("{}/veloren/assets", result).into());
} else if let Ok(result) = std::env::var("HOME") {
paths.push(format!("{}/.local/share/veloren/assets", result).into());
}
if let Ok(result) = std::env::var("XDG_DATA_DIRS") {
result.split(":").for_each(|x| paths.push(format!("{}/veloren/assets", x).into()));
} else {
// Fallback
let fallback_paths = vec!["/usr/local/share", "/usr/share"];
for fallback_path in fallback_paths {
paths.push(format!("{}/veloren/assets", fallback_path).into());
}
}
}
for path in paths.clone() {
match find_folder::Search::ParentsThenKids(3, 1)