From 29e67bbcef394fabd6557ba95e7b9c4e33ab2231 Mon Sep 17 00:00:00 2001
From: wotgl <>
Date: Sat, 23 May 2020 18:48:34 +0300
Subject: [PATCH] fix twice version validation

---
 jrnl/install.py | 2 +-
 jrnl/upgrade.py | 7 +------
 jrnl/util.py    | 5 +----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/jrnl/install.py b/jrnl/install.py
index b1b9f059..58c8cf01 100644
--- a/jrnl/install.py
+++ b/jrnl/install.py
@@ -100,7 +100,7 @@ def load_or_install_jrnl():
             from . import upgrade
 
             try:
-                upgrade.upgrade_jrnl_if_necessary(config_path)
+                upgrade.upgrade_jrnl(config_path)
             except upgrade.UpgradeValidationException:
                 print("Aborting upgrade.", file=sys.stderr)
                 print(
diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py
index 762970a1..4a638563 100644
--- a/jrnl/upgrade.py
+++ b/jrnl/upgrade.py
@@ -34,12 +34,7 @@ def check_exists(path):
     return os.path.exists(path)
 
 
-def upgrade_jrnl_if_necessary(config_path):
-    with open(config_path, "r", encoding="utf-8") as f:
-        config_file = f.read()
-    if not config_file.strip().startswith("{"):
-        return
-
+def upgrade_jrnl(config_path):
     config = util.load_config(config_path)
 
     print(
diff --git a/jrnl/util.py b/jrnl/util.py
index 2b6dd7a5..de877bd7 100644
--- a/jrnl/util.py
+++ b/jrnl/util.py
@@ -126,10 +126,7 @@ def load_config(config_path):
 def is_config_json(config_path):
     with open(config_path, "r", encoding="utf-8") as f:
         config_file = f.read()
-    if not config_file.strip().startswith("{"):
-        return False
-
-    return True
+    return config_file.strip().startswith("{"):
 
 
 def is_old_version(config_path):