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 'imbris/userdata-fixes' into 'master'

Browse Source 
Fix system data folder name, panic when outside the project dir and there is no env var set

See merge request veloren/veloren!1434
This commit is contained in:
Imbris 2020-10-13 08:00:55 +00:00
commit f4f2fb9891
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/util/userdata_dir.rs
View File

@ -24,15 +24,15 @@ pub fn userdata_dir(workspace: bool, strategy: Option<&str>, manifest_dir: &str)
// 2. The VELOREN_USERDATA_STRATEGY environment variable
.or_else(|| match strategy {
// "system" => system specific project data directory
Some(s) if s.eq_ignore_ascii_case("system") => Some(directories_next::ProjectDirs::from("net", "veloren", "userdata")
Some(s) if s.eq_ignore_ascii_case("system") => Some(directories_next::ProjectDirs::from("net", "veloren", "veloren")
.expect("System's $HOME directory path not found!")
.data_dir()
.to_owned()
.join("userdata")
),
// "executable" => <executable dir>/userdata
Some(s) if s.eq_ignore_ascii_case("executable") => {
let mut path = std::env::current_exe()
.expect("Failed to retrieve executable directory!");
.expect("Failed to retrieve executable path!");
path.pop();
path.push("userdata");
Some(path)
@ -47,6 +47,14 @@ pub fn userdata_dir(workspace: bool, strategy: Option<&str>, manifest_dir: &str)
if workspace {
path.pop();
}
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");
}
path.push("userdata");
path
})