From 71788cfd26c48f7d0cc02c8b18e4fcac8f919892 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Tue, 18 Aug 2020 15:00:12 -0400 Subject: [PATCH] single-file supports version cli flag now --- archivebox/config/__init__.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/archivebox/config/__init__.py b/archivebox/config/__init__.py index 2eb60e09..04da2632 100644 --- a/archivebox/config/__init__.py +++ b/archivebox/config/__init__.py @@ -508,16 +508,9 @@ def bin_version(binary: Optional[str]) -> Optional[str]: return None try: - if binary.split('/')[-1] in ('single-file',): - # these dependencies dont support the --version flag, but are valid still - if run([abspath, "--help"], stdout=PIPE).returncode == 0: - return '0.0.0' - else: - return None - else: - version_str = run([abspath, "--version"], stdout=PIPE).stdout.strip().decode() - # take first 3 columns of first line of version info - return ' '.join(version_str.split('\n')[0].strip().split()[:3]) + version_str = run([abspath, "--version"], stdout=PIPE).stdout.strip().decode() + # take first 3 columns of first line of version info + return ' '.join(version_str.split('\n')[0].strip().split()[:3]) except OSError: pass # stderr(f'[X] Unable to find working version of dependency: {binary}', color='red')