Merge branch 'O2Graphics/mayan-edms-fix-BSD-paths' into merges/community

This commit is contained in:
Roberto Rosario
2019-12-15 05:26:12 -04:00
3 changed files with 15 additions and 3 deletions

View File

@@ -49,7 +49,7 @@ CONVERTER_OFFICE_FILE_MIMETYPES = (
'text/rtf', 'text/rtf',
) )
if platform.system() == 'OpenBSD': if platform.system() in ('FreeBSD', 'OpenBSD'):
DEFAULT_LIBREOFFICE_PATH = '/usr/local/bin/libreoffice' DEFAULT_LIBREOFFICE_PATH = '/usr/local/bin/libreoffice'
DEFAULT_PDFINFO_PATH = '/usr/local/bin/pdfinfo' DEFAULT_PDFINFO_PATH = '/usr/local/bin/pdfinfo'
DEFAULT_PDFTOPPM_PATH = '/usr/local/bin/pdftoppm' DEFAULT_PDFTOPPM_PATH = '/usr/local/bin/pdftoppm'

View File

@@ -1,4 +1,10 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import platform
if platform.system() in ('FreeBSD', 'OpenBSD'):
DEFAULT_EXIF_PATH = '/usr/local/bin/exiftool'
else:
DEFAULT_EXIF_PATH = '/usr/bin/exiftool' DEFAULT_EXIF_PATH = '/usr/bin/exiftool'
LOCK_EXPIRE = 60 * 10 # Adjust to worst case scenario LOCK_EXPIRE = 60 * 10 # Adjust to worst case scenario

View File

@@ -1,4 +1,10 @@
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
import platform
if platform.system() in ('FreeBSD', 'OpenBSD'):
DEFAULT_TESSERACT_BINARY_PATH = '/usr/local/bin/tesseract'
else:
DEFAULT_TESSERACT_BINARY_PATH = '/usr/bin/tesseract' DEFAULT_TESSERACT_BINARY_PATH = '/usr/bin/tesseract'
DEFAULT_TESSERACT_TIMEOUT = 600 # 600 seconds, 10 minutes DEFAULT_TESSERACT_TIMEOUT = 600 # 600 seconds, 10 minutes