Merge branch 'O2Graphics/mayan-edms-fix-BSD-paths' into merges/community
This commit is contained in:
@@ -49,7 +49,7 @@ CONVERTER_OFFICE_FILE_MIMETYPES = (
|
||||
'text/rtf',
|
||||
)
|
||||
|
||||
if platform.system() == 'OpenBSD':
|
||||
if platform.system() in ('FreeBSD', 'OpenBSD'):
|
||||
DEFAULT_LIBREOFFICE_PATH = '/usr/local/bin/libreoffice'
|
||||
DEFAULT_PDFINFO_PATH = '/usr/local/bin/pdfinfo'
|
||||
DEFAULT_PDFTOPPM_PATH = '/usr/local/bin/pdftoppm'
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
DEFAULT_EXIF_PATH = '/usr/bin/exiftool'
|
||||
import platform
|
||||
|
||||
if platform.system() in ('FreeBSD', 'OpenBSD'):
|
||||
DEFAULT_EXIF_PATH = '/usr/local/bin/exiftool'
|
||||
else:
|
||||
DEFAULT_EXIF_PATH = '/usr/bin/exiftool'
|
||||
|
||||
LOCK_EXPIRE = 60 * 10 # Adjust to worst case scenario
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
DEFAULT_TESSERACT_BINARY_PATH = '/usr/bin/tesseract'
|
||||
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_TIMEOUT = 600 # 600 seconds, 10 minutes
|
||||
|
||||
Reference in New Issue
Block a user