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.

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

use settings if set globally - do not default #113

Merged
merged 1 commit into from
Mar 11, 2025
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion inc/maiken/settings.hpp
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define _MAIKEN_SETTINGS_HPP_

#include "mkn/kul/os.hpp"
#include "mkn/kul/log.hpp"
#include "mkn/kul/cli.hpp"
#include "mkn/kul/yaml.hpp"

#include "maiken/defs.hpp"
2 changes: 1 addition & 1 deletion mkn.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
name: mkn
version: master
property:
DATE: 20-FEB-2025
DATE: 11-MAR-2025
maiken_location: ${MKN_HOME}/app/mkn/${version}
maiken_scm: https://github.com/mkn/mkn
self.deps: mkn.kul
12 changes: 6 additions & 6 deletions src/maiken/create.cpp
Original file line number Diff line number Diff line change
@@ -186,6 +186,12 @@ std::vector<maiken::Application*> maiken::Application::CREATE(mkn::kul::cli::Arg
KEXIT(0, "");
}

if (args.has(STR_SETTINGS) && !Settings::SET(args.get(STR_SETTINGS)))
KEXIT(1, "Unable to set specific settings files");
else
Settings::INSTANCE();
Settings::POST_CONSTRUCT();

if (args.has(STR_QUIET)) AppVars::INSTANCE().quiet(true);
if (args.has(STR_INIT)) NewProject{};

@@ -240,12 +246,6 @@ std::vector<maiken::Application*> maiken::Application::CREATE(mkn::kul::cli::Arg
}
if (profiles.empty()) profiles.emplace_back("");

if (args.has(STR_SETTINGS) && !Settings::SET(args.get(STR_SETTINGS)))
KEXIT(1, "Unable to set specific settings files");
else
Settings::INSTANCE();
Settings::POST_CONSTRUCT();

if (args.has(STR_DUMP)) AppVars::INSTANCE().dump(true);
if (args.has(STR_FORCE)) AppVars::INSTANCE().force(true);
if (args.has(STR_DRY_RUN)) AppVars::INSTANCE().dryRun(true);
4 changes: 1 addition & 3 deletions src/settings.cpp
Original file line number Diff line number Diff line change
@@ -102,9 +102,7 @@ maiken::Settings& maiken::Settings::INSTANCE() KTHROW(mkn::kul::Exit) {
if (!instance.get()) {
mkn::kul::File const f("settings.yaml", mkn::kul::user::home("maiken"));
if (!f.dir().is()) f.dir().mk();
if (!f.is()) {
write(f);
}
if (!f.is()) write(f);
instance = std::make_unique<Settings>(mkn::kul::yaml::File::CREATE<Settings>(f.full()));
}
return *instance.get();