summaryrefslogtreecommitdiff
path: root/src/global.cc
diff options
context:
space:
mode:
authorDavid Sklar <david.sklar@gmail.com>2015-04-27 10:12:14 -0400
committerDavid Sklar <david.sklar@gmail.com>2015-04-27 10:12:14 -0400
commit6439ea4799c1ad7c3a9ccd0d2cd0f2cef55f400c (patch)
tree324c5ece16ddbd551a9523674f7a93aae5171812 /src/global.cc
parentde7d8466c03728004b4c06983b795faf593cbe59 (diff)
downloadfork-ledger-6439ea4799c1ad7c3a9ccd0d2cd0f2cef55f400c.tar.gz
fork-ledger-6439ea4799c1ad7c3a9ccd0d2cd0f2cef55f400c.tar.bz2
fork-ledger-6439ea4799c1ad7c3a9ccd0d2cd0f2cef55f400c.zip
Use ./.ledgerrc if ~/.ledgerrc doesn't exist
Diffstat (limited to 'src/global.cc')
-rw-r--r--src/global.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/global.cc b/src/global.cc
index bdaabd5a..e4ebe6f5 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -110,7 +110,7 @@ global_scope_t::~global_scope_t()
void global_scope_t::parse_init(path init_file)
{
TRACE_START(init, 1, "Read initialization file");
-
+
parse_context_stack_t parsing_context;
parsing_context.push(init_file);
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%'")
% init_file);
}
-
+
TRACE_FINISH(init, 1);
}
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
// 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
@@ -144,6 +144,9 @@ void global_scope_t::read_init()
} else {
if (const char * home_var = std::getenv("HOME")) {
init_file = (path(home_var) / ".ledgerrc");
+ if (! exists(init_file)) {
+ init_file = ("./.ledgerrc");
+ }
} else {
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) {
#if DEBUG_ON
- _log_level = LOG_DEBUG;
+ _log_level = LOG_DEBUG;
_log_category = argv[i + 1];
i++;
#endif