diff --git a/jrnl/config.py b/jrnl/config.py index c8d5902c..aed17200 100644 --- a/jrnl/config.py +++ b/jrnl/config.py @@ -91,7 +91,7 @@ def get_config_path(): def get_default_config(): return { "version": __version__, - "journals": {"default": get_default_journal_path()}, + "journals": {"default": {"journal": get_default_journal_path()}}, "editor": os.getenv("VISUAL") or os.getenv("EDITOR") or "", "encrypt": False, "template": False, diff --git a/jrnl/install.py b/jrnl/install.py index a4797dc7..b20685f0 100644 --- a/jrnl/install.py +++ b/jrnl/install.py @@ -122,10 +122,10 @@ def install(): ) journal_path = absolute_path(user_given_path or default_journal_path) default_config = get_default_config() - default_config["journals"][DEFAULT_JOURNAL_KEY] = journal_path + default_config["journals"][DEFAULT_JOURNAL_KEY]["journal"] = journal_path # If the folder doesn't exist, create it - path = os.path.split(default_config["journals"][DEFAULT_JOURNAL_KEY])[0] + path = os.path.split(journal_path)[0] try: os.makedirs(path) except OSError: diff --git a/tests/lib/then_steps.py b/tests/lib/then_steps.py index cb7e9766..61916262 100644 --- a/tests/lib/then_steps.py +++ b/tests/lib/then_steps.py @@ -118,7 +118,7 @@ def output_should_be_columns_wide(cli_run, width): ) ) def default_journal_location(journal_file, journal_dir, config_on_disk, temp_dir): - default_journal_path = config_on_disk["journals"]["default"] + default_journal_path = config_on_disk["journals"]["default"]["journal"] expected_journal_path = ( os.path.join(temp_dir.name, journal_file) if journal_dir == "."