fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-29 22:16:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a logic bug so that jrnl -h and jrnl -v are possible even if jrnl not configured yet.

Browse source
This commit is contained in:
Manuel Ebert 2014-01-26 14:15:46 +01:00
parent da9be85198
commit 9cc37f964f
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
jrnl/cli.py
View file

@ -100,6 +100,13 @@ def update_config(config, new_config, scope, force_local=False):
config.update(new_config)
def run(manual_args=None):
args = parse_args(manual_args)
if args.version:
version_str = "{0} version {1}".format(jrnl.__title__, jrnl.__version__)
print(util.py2encode(version_str))
sys.exit(0)
if not os.path.exists(CONFIG_PATH):
config = install.install_jrnl(CONFIG_PATH)
else:
@ -112,12 +119,7 @@ def run(manual_args=None):
util.prompt("According to your jrnl_conf, your journal is encrypted, however PyCrypto was not found. To open your journal, install the PyCrypto package from http://www.pycrypto.org.")
sys.exit(1)
args = parse_args(manual_args)
if args.version:
version_str = "{0} version {1}".format(jrnl.__title__, jrnl.__version__)
print(util.py2encode(version_str))
sys.exit(0)
# If the first textual argument points to a journal file,
# use this!