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

Fallback to executable strategy for the userdata rather than panicking when USERDATA_STRATEGY isn't set and the executable is moved out of the project folder

Browse Source
This commit is contained in:
Imbris 2021-06-14 21:42:50 -04:00
parent 109d87bf81
commit 6fe3a3c77f
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/base/src/userdata_dir.rs
View File

@ -1,4 +1,5 @@
use std::path::PathBuf;
use tracing::warn;
const VELOREN_USERDATA_ENV: &str = "VELOREN_USERDATA";
@ -52,14 +53,20 @@ pub fn userdata_dir(workspace: bool, strategy: Option<&str>, manifest_dir: &str)
}
let exe_path = std::env::current_exe()
.expect("Failed to retrieve executable path!");
// Ensure this path exists
// Ensure that the binary path is prefixed by this path
if !path.exists() || !exe_path.starts_with(&path) {
panic!("Recompile with VELOREN_USERDATA_STRATEGY set to \"system\" or \"executable\" to run the binary outside of the project folder");
// If this path exists
// and the binary path is prefixed by this path
// put the userdata folder there
if path.exists() && exe_path.starts_with(&path) {
path.push("userdata");
path
} else {
// otherwise warn and fallback to the executable strategy
warn!("This binary was moved to outside the project folder where it was compiled and was not compiled with VELOREN_USERDATA_STRATEGY set to \"system\" or \"executable\". Falling back the to the \"executable\" strategy (the userdata folder will be placed in the same folder as the executable)");
let mut path = exe_path;
path.pop();
path.push("userdata");
path
}
path.push("userdata");
path
})
}