From bc5ea95cca6f431c11bcac61df2e5f67ca37df7d Mon Sep 17 00:00:00 2001 From: abakum Date: Mon, 4 Mar 2019 16:22:40 +0300 Subject: Update magic.py libmagic-1.dll for git clone https://github.com/threatstack/libmagic.git msys-magic-1.dll for MSYS2 --- magic.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'magic.py') diff --git a/magic.py b/magic.py index bd9d6b4..be7293f 100644 --- a/magic.py +++ b/magic.py @@ -160,14 +160,16 @@ libmagic = None # Let's try to find magic or magic1 dll = ctypes.util.find_library('magic') \ or ctypes.util.find_library('magic1') \ - or ctypes.util.find_library('cygmagic-1') + or ctypes.util.find_library('cygmagic-1') \ + or ctypes.util.find_library('libmagic-1') \ #for git clone https://github.com/threatstack/libmagic.git + or ctypes.util.find_library('msys-magic-1') #for MSYS2 # necessary because find_library returns None if it doesn't find the library if dll: libmagic = ctypes.CDLL(dll) if not libmagic or not libmagic._name: - windows_dlls = ['magic1.dll', 'cygmagic-1.dll'] + windows_dlls = ['magic1.dll', 'cygmagic-1.dll', 'libmagic-1.dll', 'msys-magic-1.dll'] platform_to_lib = {'darwin': ['/opt/local/lib/libmagic.dylib', '/usr/local/lib/libmagic.dylib'] + # Assumes there will only be one version installed -- cgit v1.2.1