LIV2/amiberry
1
0
Fork 0
mirror of https://github.com/LIV2/amiberry.git synced 2025-12-06 06:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Use XDG_DATA_HOME in a better way (fixes #1457)

Browse Source 
- There should be a subdir for amiberry in XDG_DATA_HOME, if we choose that
- The data files should go under amiberry/data there
This commit is contained in:
Dimitris Panokostas 2024-10-05 15:20:48 +02:00
parent b5129e7aa0
commit fadeac9ab7
No known key found for this signature in database
GPG Key ID: 330156A68E9E0929
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/osdep/amiberry.cpp
View File

@ -4208,11 +4208,12 @@ std::string get_data_directory()
write_log("Using data directory from " AMIBERRY_DATADIR "\n");
return AMIBERRY_DATADIR;
}
if (xdg_data_home != nullptr && directory_exists(xdg_data_home, "/data"))
if (xdg_data_home != nullptr && directory_exists(xdg_data_home, "/amiberry/data"))
{
// If the XDG_DATA_HOME is set, use it
write_log("Using data directory from XDG_DATA_HOME: %s\n", xdg_data_home);
return { xdg_data_home };
std::string xdg_data_home_amiberry = std::string(xdg_data_home) + "/amiberry/data";
write_log("Using data directory from XDG_DATA_HOME: %s\n", xdg_data_home_amiberry.c_str());
return { xdg_data_home_amiberry };
}
// Fallback Portable mode, all in the startup path (default behavior for previous Amiberry versions)
@ -4247,9 +4248,15 @@ std::string get_home_directory()
}
if (xdg_data_home != nullptr)
{
if (!directory_exists(xdg_data_home, "/amiberry"))
{
// If $XDG_DATA_HOME exists, but not the Amiberry subdirectory, create it
my_mkdir((std::string(xdg_data_home) + "/amiberry").c_str());
}
// If the XDG_DATA_HOME is set, use it
write_log("Using home directory from XDG_DATA_HOME: %s\n", xdg_data_home);
return { xdg_data_home };
std::string xdg_data_home_amiberry = std::string(xdg_data_home) + "/amiberry";
write_log("Using home directory from XDG_DATA_HOME: %s\n", xdg_data_home_amiberry.c_str());
return { xdg_data_home_amiberry };
}
if (user_home_dir != nullptr)
{