Skip to content

Fix --user-path override on linux #223

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

Open
noahcoolboy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix --user-path override on linux #223

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
25 changes: 20 additions & 5 deletions src/GameStart.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,29 @@ std::filesystem::path GetGamePath() {
}
#elif defined(__linux__)
std::filesystem::path GetGamePath() {
// Right now only steam is supported
struct passwd* pw = getpwuid(getuid());
std::string homeDir = pw->pw_dir;
static std::filesystem::path Path;
if (!Path.empty())
return Path;

if (options.user_path) {
if (std::filesystem::exists(options.user_path)) {
Path = options.user_path;
debug("Using custom user folder path: " + Path.string());
} else
warn("Invalid or non-existent path (" + std::string(options.user_path) + ") specified using --user-path, skipping");
}

if (Path.empty()) {
// Right now only steam is supported
struct passwd* pw = getpwuid(getuid());
std::string homeDir = pw->pw_dir;

Path = homeDir + "/.local/share/BeamNG/BeamNG.drive/";
}

std::string Path = homeDir + "/.local/share/BeamNG/BeamNG.drive/";
std::string Ver = CheckVer(GetGameDir());
Ver = Ver.substr(0, Ver.find('.', Ver.find('.') + 1));
Path += "current/";
Path /= "current/";
return Path;
}
#endif
Expand Down
Loading