Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename USE_HOME_DIR save/conf dir to cataclysm-bn #1474

Merged
merged 1 commit into from
Apr 26, 2022
Merged

Rename USE_HOME_DIR save/conf dir to cataclysm-bn #1474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/path_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,20 @@ void PATH_INFO::init_user_dir( std::string dir )
#if defined(_WIN32)
user_dir = getenv( "LOCALAPPDATA" );
// On Windows userdir without dot
dir = std::string( user_dir ) + "/cataclysm-dda/";
dir = std::string( user_dir ) + "/cataclysm-bn/";
#elif defined(MACOSX)
user_dir = getenv( "HOME" );
dir = std::string( user_dir ) + "/Library/Application Support/Cataclysm/";
dir = std::string( user_dir ) + "/Library/Application Support/Cataclysm-BN/";
#elif defined(USE_XDG_DIR)
if( ( user_dir = getenv( "XDG_DATA_HOME" ) ) ) {
dir = std::string( user_dir ) + "/cataclysm-dda/";
dir = std::string( user_dir ) + "/cataclysm-bn/";
} else {
user_dir = getenv( "HOME" );
dir = std::string( user_dir ) + "/.local/share/cataclysm-dda/";
dir = std::string( user_dir ) + "/.local/share/cataclysm-bn/";
}
#else
user_dir = getenv( "HOME" );
dir = std::string( user_dir ) + "/.cataclysm-dda/";
dir = std::string( user_dir ) + "/.cataclysm-bn/";
#endif
}

Expand Down Expand Up @@ -103,10 +103,10 @@ void PATH_INFO::set_standard_filenames()
const char *user_dir;
std::string dir;
if( ( user_dir = getenv( "XDG_CONFIG_HOME" ) ) ) {
dir = std::string( user_dir ) + "/cataclysm-dda/";
dir = std::string( user_dir ) + "/cataclysm-bn/";
} else {
user_dir = getenv( "HOME" );
dir = std::string( user_dir ) + "/.config/cataclysm-dda/";
dir = std::string( user_dir ) + "/.config/cataclysm-bn/";
}
config_dir_value = dir;
#else
Expand Down