Merge pull request #12 from PokemonGoF/dev

From Main Repo Merge
PokemonGoF · Oct 20, 2017 · 9678fc2 · 9678fc2
2 parents 61b34a5 + 7101b02
commit 9678fc2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/MultiBot.py b/MultiBot.py
@@ -116,8 +116,6 @@ def GetHashKey(self):
                 pass
 
     def getProxy(self):
-        # global proxyCur
-        # global proxy
         while True:
             try:
                 proxy = self.proxyAll[0]
@@ -255,18 +253,18 @@ def run(self):
                 StartCmd = "python pokecli.py -af configs/temp/auth-{0}.json -cf configs/temp/config-{0}.json --walker_limit_output {1}".format(
                     self.CurThread, MultiBotConfig[u'walker_limit_output'])
                 if MultiBotConfig[u'UseProxy']:
-                    proxy2 = Manager.getProxy()
+                    proxy = Manager.getProxy()
                     if platform.system() == "Linux":
-                        # os.system('export HTTP_PROXY="http://' + proxy + '"; export HTTPS_PROXY="https://' + proxy + '"; ' + StartCmd)
-                        pass
+                        os.system('export HTTP_PROXY="http://' + proxy + '"; export HTTPS_PROXY="https://' + proxy + '"; ' + StartCmd)
+                        # pass
                     if platform.system() == "Windows":
-                        pass
-                        # os.system('set HTTP_PROXY="http://' + proxy + '" & set HTTPS_PROXY="https://' + proxy + '" & ' + StartCmd)
+                        # pass
+                        os.system('set HTTP_PROXY="http://' + proxy + '" & set HTTPS_PROXY="https://' + proxy + '" & ' + StartCmd)
                 else:
-                    pass
-                    # os.system(StartCmd)
+                    # pass
+                    os.system(StartCmd)
             except Exception as e:
-                Lprint((traceback()))
+                Lprint(e)
                 time.sleep(60)
             except KeyboardInterrupt:
                 stop()

diff --git a/killswitch.json b/killswitch.json
@@ -3,5 +3,5 @@
 	"show_warning": true,
 	"pause_bot": true,
     "activated_by": "MerlionRock",
-    "message": "Bot is now compatible with 0.75.1 API. There are noted issues with the current API and subsequent bans and warnings may very well be issued and you take the risk into your own hands if you follow through."
+    "message": "Bot is now compatible with 0.77.1 API. Please refer to documenations on how to do an update. There are noted issues with the current API and subsequent bans and warnings may very well be issued and you take the risk into your own hands if you follow through."
 }