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

Jump to bottom

Change user config path to match system-wide directory structure #618

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

Change user config path to match system-wide directory structure #618

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions alc/alconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,17 +440,17 @@ void ReadALConfig()
if(auto configdir = al::getenv("XDG_CONFIG_HOME"))
{
fname = *configdir;
if(fname.back() != '/') fname += "/alsoft.conf";
else fname += "alsoft.conf";
if(fname.back() != '/') fname += "/openal/alsoft.conf";
else fname += "openal/alsoft.conf";
}
else
{
fname.clear();
if(auto homedir = al::getenv("HOME"))
{
fname = *homedir;
if(fname.back() != '/') fname += "/.config/alsoft.conf";
else fname += ".config/alsoft.conf";
if(fname.back() != '/') fname += "/.config/openal/alsoft.conf";
else fname += ".config/openal/alsoft.conf";
}
}
if(!fname.empty())
Expand Down
2 changes: 1 addition & 1 deletion alsoftrc.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Options marked as "(global)" are not influenced by the device.
#
# The system-wide settings can be put in /etc/openal/alsoft.conf and user-
# specific override settings in $HOME/.alsoftrc.
# specific override settings in $HOME/.alsoftrc or $XDG_CONFIG_HOME/openal/alsoft.conf (~/.config/openal/alsoft.conf).
# For Windows, these settings should go into $AppData\alsoft.ini
#
# Option and block names are case-senstive. The supplied values are only hints
Expand Down
2 changes: 1 addition & 1 deletion utils/alsoft-config/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static QString getDefaultConfigName()
};
QString base = get_appdata_path();
#else
static const char fname[] = "alsoft.conf";
static const char fname[] = "openal/alsoft.conf";
QByteArray base = qgetenv("XDG_CONFIG_HOME");
if(base.isEmpty())
{
Expand Down