From 526db0ab55e9b39d74412656703df54e0ada6c97 Mon Sep 17 00:00:00 2001 From: Pablo Silva Date: Mon, 7 Nov 2016 04:47:01 -0800 Subject: [PATCH] Fix on wrong filename for Linux libraries --- pokemongo_bot/__init__.py | 26 +++++++++++++------------- requirements.txt | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py index c0d7d0c1be..c0a27effe4 100644 --- a/pokemongo_bot/__init__.py +++ b/pokemongo_bot/__init__.py @@ -167,7 +167,7 @@ def _setup_event_system(self): if self.config.websocket_start_embedded_server: self.sio_runner = SocketIoRunner(self.config.websocket_server_url) self.sio_runner.start_listening_async() - + websocket_handler = SocketIoHandler( self, self.config.websocket_server_url @@ -975,17 +975,17 @@ def login(self): ) self.heartbeat() - #I'm missing OSX libraries support, anyone that can help me on this. def get_encryption_lib(self): if _platform == "Windows" or _platform == "win32": # Check if we are on 32 or 64 bit if sys.maxsize > 2**32: - file_name = 'encrypt64.dll' + file_name = 'src/pgoapi/pgoapi/lib/encrypt64.dll' else: - file_name = 'encrypt32.dll' - else: - file_name = 'libencrypt-linux-x86-64.so' - + file_name = 'src/pgoapi/pgoapi/lib/encrypt32.dll' + if _platform.lower() == "darwin": + file_name= 'src/pgoapi/pgoapi/lib/libencrypt-osx-64.so' + if _platform.lower() == "linux" or _platform.lower() == "linux2": + file_name = 'src/pgoapi/pgoapi/lib/libencrypt-linux-x86-64.so' if self.config.encrypt_location == '': path = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) else: @@ -1001,17 +1001,17 @@ def get_encryption_lib(self): return full_path - #I'm missing OSX libraries support, anyone that can help me on this. def get_hash_lib(self): if _platform == "Windows" or _platform == "win32": # Check if we are on 32 or 64 bit if sys.maxsize > 2**32: - file_name = 'niantichash64.dll' + file_name = 'src/pgoapi/pgoapi/lib/niantichash64.dll' else: - file_name = 'niantichash32.dll' - else: - file_name = 'libniantichash-linux-x86-64.so' - + file_name = 'src/pgoapi/pgoapi/lib/niantichash32.dll' + if _platform.lower() == "darwin": + file_name= 'src/pgoapi/pgoapi/lib/libniantichash-osx-64.so' + if _platform.lower() == "linux" or _platform.lower() == "linux2": + file_name = 'src/pgoapi/pgoapi/lib/libniantichash-linux-x86-64.so' if self.config.encrypt_location == '': path = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) else: diff --git a/requirements.txt b/requirements.txt index 62c16aae25..f90247648a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ numpy==1.11.0 networkx==1.11 --e git+https://github.com/pogodevorg/pgoapi.git#egg=pgoapi +-e git+https://github.com/pogodevorg/pgoapi.git/@1a112879f424b518f994b99f43859dd95cd43fdf#egg=pgoapi geopy==1.11.0 geographiclib==1.46.3 protobuf==3.0.0b4