Mirrors/ArchiveBox
2
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox synced 2024-11-26 14:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix MERCURY_PATH in version output when missing

Browse source
This commit is contained in:
Nick Sweeting 2020-12-11 16:21:33 +02:00
parent c084e70ea8
commit 6623497f18
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archivebox/config.py
View file

@ -320,7 +320,7 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = {
'READABILITY_VERSION': {'default': lambda c: bin_version(c['READABILITY_BINARY']) if c['USE_READABILITY'] else None}, 'READABILITY_VERSION': {'default': lambda c: bin_version(c['READABILITY_BINARY']) if c['USE_READABILITY'] else None},
'USE_MERCURY': {'default': lambda c: c['USE_MERCURY'] and c['SAVE_MERCURY']}, 'USE_MERCURY': {'default': lambda c: c['USE_MERCURY'] and c['SAVE_MERCURY']},
'MERCURY_VERSION': {'default': lambda c: '1.0.0' if (c['USE_MERCURY'] and c['MERCURY_BINARY']) else None}, # mercury is unversioned 'MERCURY_VERSION': {'default': lambda c: '1.0.0' if shutil.which(bin_path(c['MERCURY_BINARY'])) else None}, # mercury is unversioned
'USE_GIT': {'default': lambda c: c['USE_GIT'] and c['SAVE_GIT']}, 'USE_GIT': {'default': lambda c: c['USE_GIT'] and c['SAVE_GIT']},
'GIT_VERSION': {'default': lambda c: bin_version(c['GIT_BINARY']) if c['USE_GIT'] else None}, 'GIT_VERSION': {'default': lambda c: bin_version(c['GIT_BINARY']) if c['USE_GIT'] else None},
@ -595,7 +595,7 @@ def bin_path(binary: Optional[str]) -> Optional[str]:
if node_modules_bin.exists(): if node_modules_bin.exists():
return str(node_modules_bin.resolve()) return str(node_modules_bin.resolve())
return shutil.which(Path(binary).expanduser()) or binary return shutil.which(Path(binary).expanduser()) or shutil.which(binary) or binary
def bin_hash(binary: Optional[str]) -> Optional[str]: def bin_hash(binary: Optional[str]) -> Optional[str]:
if binary is None: if binary is None: