mirror/polybar
3
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2026-02-15 08:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): Load on instantiation

Browse Source
This commit is contained in:
Michael Carlberg
2016-12-09 11:32:41 +01:00
parent 4fca0c89b4
commit 540bcb9fd0
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@ -68,9 +68,10 @@ int main(int argc, char** argv) {
// Parse command line arguments
//==================================================
string scriptname{argv[0]};
vector<string> args(argv + 1, argv + argc);
vector<string> args{argv + 1, argv + argc};
cliparser::make_type cli{cliparser::make(move(scriptname), opts)};
unique_ptr<cliparser> cli{command_line::parser::make(scriptname, opts)};
cli->process_input(args);
if (cli->has("quiet")) {
@ -93,18 +94,20 @@ int main(int argc, char** argv) {
//==================================================
// Load user configuration
//==================================================
config& conf{const_cast<config&>(config::make())};
string confpath;
if (cli->has("config")) {
conf.load(cli->get("config"), args[0]);
confpath = cli->get("config");
} else if (env_util::has("XDG_CONFIG_HOME")) {
conf.load(env_util::get("XDG_CONFIG_HOME") + "/polybar/config", args[0]);
confpath = env_util::get("XDG_CONFIG_HOME") + "/polybar/config";
} else if (env_util::has("HOME")) {
conf.load(env_util::get("HOME") + "/.config/polybar/config", args[0]);
confpath = env_util::get("HOME") + "/.config/polybar/config";
} else {
throw application_error("Define configuration using --config=PATH");
}
config::make_type conf{config::make(move(confpath), args[0])};
//==================================================
// Dump requested data
//==================================================