diff options
| author | Rémi Verschelde | 2017-11-20 00:42:51 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-20 00:42:51 +0100 |
| commit | ecf80fbbbadaa782cbe81a6562916331c6762970 (patch) | |
| tree | 7a949f6a95f36303a2f2d193aeabd6486e13f4a1 /drivers/unix/os_unix.cpp | |
| parent | bc26a5bd3a51b11bab63112275e7045c63a0ffc4 (diff) | |
| parent | 6e3f2f44af808e9f4255c2462e16beee844c0df7 (diff) | |
| download | godot-ecf80fbbbadaa782cbe81a6562916331c6762970.tar.gz godot-ecf80fbbbadaa782cbe81a6562916331c6762970.tar.zst godot-ecf80fbbbadaa782cbe81a6562916331c6762970.zip | |
Diffstat (limited to 'drivers/unix/os_unix.cpp')
| -rw-r--r-- | drivers/unix/os_unix.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 729abd57e..ce0967af2 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -454,32 +454,21 @@ int OS_Unix::get_processor_count() const { return sysconf(_SC_NPROCESSORS_CONF); } -String OS_Unix::get_data_dir() const { +String OS_Unix::get_user_data_dir() const { - String an = get_safe_application_name(); - if (an != "") { - - if (has_environment("HOME")) { - - bool use_godot = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir"); - if (use_godot) - return get_environment("HOME") + "/.godot/app_userdata/" + an; - else - return get_environment("HOME") + "/." + an; + String appname = get_safe_application_name(); + if (appname != "") { + bool use_godot_dir = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir"); + if (use_godot_dir) { + return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file(appname); + } else { + return get_data_path().plus_file(appname); } } return ProjectSettings::get_singleton()->get_resource_path(); } -String OS_Unix::get_installed_templates_path() const { - String p = get_global_settings_path(); - if (p != "") - return p + "/templates/"; - else - return ""; -} - String OS_Unix::get_executable_path() const { #ifdef __linux__ |