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

Search for assets in workspace root

Browse Source
This commit is contained in:
juliancoffee 2021-05-08 17:51:47 +03:00
parent 279d57658d
commit 9af0b6dd12
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/assets/src/lib.rs
View File

@ -134,6 +134,7 @@ lazy_static! {
/// 3. Download & hopefully extract zip (`assets` next to binary)
/// 4. Running through cargo (`assets` in workspace root but not always in cwd incase you `cd voxygen && cargo r`)
/// 5. Running executable in the target dir (`assets` in workspace)
/// 6. Running tests (`assets` in workspace root)
pub static ref ASSETS_PATH: PathBuf = {
let mut paths = Vec::new();
@ -162,7 +163,23 @@ lazy_static! {
paths.push(path);
}
// 5. System paths
// 5. Root of the repository
if let Ok(path) = std::env::current_dir() {
// If we are in the root, push path
if path.join(".git").is_dir() {
paths.push(path);
} else {
// Search .git directory in parent directries
for ancestor in path.ancestors() {
if ancestor.join(".git").is_dir() {
paths.push(ancestor.to_path_buf());
break;
}
}
}
}
// 6. System paths
#[cfg(all(unix, not(target_os = "macos"), not(target_os = "ios"), not(target_os = "android")))]
{
if let Ok(result) = std::env::var("XDG_DATA_HOME") {