Merge pull request #14 from PokemonGoF/dev

Merge from Main Repo
PokemonGoF · Oct 25, 2017 · 06de7a6 · 06de7a6
2 parents a0f68bb + 34b63d1
commit 06de7a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pokecli.py b/pokecli.py
@@ -123,7 +123,7 @@ def initialize(config):
             if killswitch_data['show_warning']:
                 yn=None
                 while yn==None:
-                    if killswitch_data['pause_bot'] or not bypass_warning:
+                    if killswitch_data['pause_bot'] and not bypass_warning:
                         yn = yes_no("\033[91mMessage: " + format(killswitch_data['message'])+ "\033[0m\nDo you wish to continue? Y/N")
                     else:
                         print "\033[91mMessage: " + format(killswitch_data['message']) + "\033[0m\n"

diff --git a/runMultiBot.sh b/runMultiBot.sh
@@ -10,7 +10,7 @@ then
 fi
 git fetch -a
 installed=(`pip list 2>/dev/null |sed -e 's/ //g' -e 's/(/:/' -e 's/)//' -e 's/[-_]//g' | awk '{print tolower($0)}'`)
-required=(`cat requirements.txt | sed -e 's/.*pgoapi$/pgoapi==2.13.0/' -e 's/[-_]//g' -e 's/==\(.*\)/:\1/' | awk '{print tolower($0)}'`)
+required=(`cat requirements.txt | sed -e 's/.*pgoapi$/pgoapi==2.14.0/' -e 's/[-_]//g' -e 's/==\(.*\)/:\1/' | awk '{print tolower($0)}'`)
 for package in ${required[@]}
 do
   if [[ ! (${installed[*]} =~ $package) ]];