nicole/cellar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

config cli fixes

Browse Source
This commit is contained in:
Nicole O'Connor 2025-01-18 23:18:12 -08:00
parent 1f9a78956b
commit d1960506ac
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/config/cli_handler.cpp
View File

@ -46,7 +46,15 @@ void cellar::config::config_command(int argc, vector<string> argv) {
return; return;
} }
string myval = active_bottle.get_config(key); string myval;
if (global) {
if (config::global_config.find(key) != config::global_config.end()) {
myval = config::global_config[key];
} else if (config::compiled_config.find(key) != config::compiled_config.end()) {
myval = config::compiled_config[key];
}
}
else { myval = active_bottle.get_config(key); }
if (myval != "") { if (myval != "") {
output::statement(key + ": " + myval); output::statement(key + ": " + myval);
@ -60,7 +68,14 @@ void cellar::config::config_command(int argc, vector<string> argv) {
} }
string newvalue = value; string newvalue = value;
string oldvalue = active_bottle.get_config(key); string oldvalue
if (global) {
if (config::global_config.find(key) != config::global_config.end()) {
oldvalue = config::global_config[key];
} else if (config::compiled_config.find(key) != config::compiled_config.end()) {
oldvalue = config::compiled_config[key];
}
} else { oldvalue = active_bottle.get_config(key); }
if (active_bottle.set_config(key, newvalue)) { if (active_bottle.set_config(key, newvalue)) {
output::statement(key + ": " + newvalue + " (was " + oldvalue + ")"); output::statement(key + ": " + newvalue + " (was " + oldvalue + ")");