sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #414 from davidsklar/next

Browse source 
Use ./.ledgerrc if ~/.ledgerrc doesn't exist
This commit is contained in:
John Wiegley 2015-04-27 09:28:27 -05:00
commit 61156c8618
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/global.cc
View file

@ -110,7 +110,7 @@ global_scope_t::~global_scope_t()
void global_scope_t::parse_init(path init_file) void global_scope_t::parse_init(path init_file)
{ {
TRACE_START(init, 1, "Read initialization file"); TRACE_START(init, 1, "Read initialization file");
parse_context_stack_t parsing_context; parse_context_stack_t parsing_context;
parsing_context.push(init_file); parsing_context.push(init_file);
parsing_context.get_current().journal = session().journal.get(); parsing_context.get_current().journal = session().journal.get();
@ -122,13 +122,13 @@ void global_scope_t::parse_init(path init_file)
throw_(parse_error, _f("Transactions found in initialization file '%1%'") throw_(parse_error, _f("Transactions found in initialization file '%1%'")
% init_file); % init_file);
} }
TRACE_FINISH(init, 1); TRACE_FINISH(init, 1);
} }
void global_scope_t::read_init() void global_scope_t::read_init()
{ {
// if specified on the command line init_file_ is filled in // if specified on the command line init_file_ is filled in
// global_scope_t::handle_debug_options. If it was specified on the command line // global_scope_t::handle_debug_options. If it was specified on the command line
// fail if the file doesn't exist. If no init file was specified // fail if the file doesn't exist. If no init file was specified
// on the command-line then try the default values, but don't fail if there // on the command-line then try the default values, but don't fail if there
@ -144,6 +144,9 @@ void global_scope_t::read_init()
} else { } else {
if (const char * home_var = std::getenv("HOME")) { if (const char * home_var = std::getenv("HOME")) {
init_file = (path(home_var) / ".ledgerrc"); init_file = (path(home_var) / ".ledgerrc");
if (! exists(init_file)) {
init_file = ("./.ledgerrc");
}
} else { } else {
init_file = ("./.ledgerrc"); init_file = ("./.ledgerrc");
} }
@ -499,7 +502,7 @@ void handle_debug_options(int argc, char * argv[])
} }
else if (i + 1 < argc && std::strcmp(argv[i], "--debug") == 0) { else if (i + 1 < argc && std::strcmp(argv[i], "--debug") == 0) {
#if DEBUG_ON #if DEBUG_ON
_log_level = LOG_DEBUG; _log_level = LOG_DEBUG;
_log_category = argv[i + 1]; _log_category = argv[i + 1];
i++; i++;
#endif #endif