From 50cd7bf243eab90b88a2d8bd99e105b39647f331 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 12 Aug 2016 04:59:57 -0400 Subject: [PATCH] Config/encrypt fix (#3707) * Fix typo in config * Fix all configs * Fixed __init__.py thanks to @hklcf --- configs/config.json.cluster.example | 2 +- configs/config.json.example | 2 +- configs/config.json.map.example | 2 +- configs/config.json.optimizer.example | 1 + configs/config.json.path.example | 2 +- configs/config.json.pokemon.example | 2 +- pokemongo_bot/__init__.py | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configs/config.json.cluster.example b/configs/config.json.cluster.example index bb01bb44f3..c9cc3b3ca3 100644 --- a/configs/config.json.cluster.example +++ b/configs/config.json.cluster.example @@ -4,7 +4,7 @@ "password": "YOUR_PASSWORD", "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", - "libencrypt_location": "", + "encrypt_location": "", "tasks": [ { "type": "HandleSoftBan" diff --git a/configs/config.json.example b/configs/config.json.example index 502c18c78e..2cf5a0f737 100644 --- a/configs/config.json.example +++ b/configs/config.json.example @@ -4,7 +4,7 @@ "password": "YOUR_PASSWORD", "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", - "libencrypt_location": "", + "encrypt_location": "", "tasks": [ { "type": "HandleSoftBan" diff --git a/configs/config.json.map.example b/configs/config.json.map.example index acb6b2f5ea..ff2b8a69e2 100644 --- a/configs/config.json.map.example +++ b/configs/config.json.map.example @@ -4,7 +4,7 @@ "password": "YOUR_PASSWORD", "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", - "libencrypt_location": "", + "encrypt_location": "", "tasks": [ { "type": "HandleSoftBan" diff --git a/configs/config.json.optimizer.example b/configs/config.json.optimizer.example index f63a2b7ae1..4db7f2cee6 100644 --- a/configs/config.json.optimizer.example +++ b/configs/config.json.optimizer.example @@ -4,6 +4,7 @@ "password": "YOUR_PASSWORD", "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", + "encrypt_location": "", "tasks": [ { "type": "HandleSoftBan" diff --git a/configs/config.json.path.example b/configs/config.json.path.example index 52286b2809..23578f8125 100644 --- a/configs/config.json.path.example +++ b/configs/config.json.path.example @@ -4,7 +4,7 @@ "password": "YOUR_PASSWORD", "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", - "libencrypt_location": "", + "encrypt_location": "", "tasks": [ { "type": "HandleSoftBan" diff --git a/configs/config.json.pokemon.example b/configs/config.json.pokemon.example index c271f21fcc..a2d5d96a2b 100644 --- a/configs/config.json.pokemon.example +++ b/configs/config.json.pokemon.example @@ -4,7 +4,7 @@ "password": "YOUR_PASSWORD", "location": "SOME_LOCATION", "gmapkey": "GOOGLE_MAPS_API_KEY", - "libencrypt_location": "", + "encrypt_location": "", "tasks": [ { "type": "HandleSoftBan" diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py index f49d698464..7d8a207ece 100644 --- a/pokemongo_bot/__init__.py +++ b/pokemongo_bot/__init__.py @@ -670,7 +670,7 @@ def get_encryption_lib(self): full_path = path + '/'+ file_name if not os.path.isfile(full_path): - self.logger.error(file_name + ' is not found! Please place it in the bots root directory or set libencrypt_location in config.') + self.logger.error(file_name + ' is not found! Please place it in the bots root directory or set encrypt_location in config.') self.logger.info('Platform: '+ _platform + ' Encrypt.so directory: '+ path) sys.exit(1) else: