From 87aeeacb04f213e6ac7321b19f425bef6dad03ea Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Sat, 15 Aug 2015 15:12:05 -0700 Subject: [PATCH] Fix erroneous instruction to "apt-get install tesseract" Should be tesseract-ocr --- setup.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index bec61d6a..8b2c9ae6 100644 --- a/setup.py +++ b/setup.py @@ -4,6 +4,7 @@ from setuptools import setup from subprocess import Popen, STDOUT, check_output, CalledProcessError from string import Template +from collections.abc import Mapping import re import sys @@ -48,18 +49,30 @@ commands: sudo apt-get install {package} On RPM-based systems (Red Hat, Fedora), search for instructions on -installing the RPM for {package}. +installing the RPM for {program}. ''' +def get_platform(): + if sys.platform.startswith('freebsd'): + return 'freebsd' + elif sys.platform.startswith('linux'): + return 'linux' + return sys.platform + + def _error_trailer(program, package, optional, **kwargs): if optional: print(okay_its_optional.format(**locals()), file=sys.stderr) else: print(not_okay_its_required.format(**locals()), file=sys.stderr) - if sys.platform.startswith('darwin'): + + if isinstance(package, Mapping): + package = package[get_platform()] + + if get_platform() == 'darwin': print(osx_install_advice.format(**locals()), file=sys.stderr) - elif sys.platform.startswith('linux'): + elif get_platform() == 'linux': print(linux_install_advice.format(**locals()), file=sys.stderr) @@ -136,7 +149,7 @@ if command.startswith('install') or \ check_external_program( program='tesseract', need_version='3.02.02', - package='tesseract' + package={'darwin': 'tesseract', 'linux': 'tesseract-ocr'} ) check_external_program( program='gs',