Skip to content

Commit

Permalink
Merge pull request #6164 from nbq/fix_mb_shell
Browse files Browse the repository at this point in the history
Fix pgo requirement in multibot shell
  • Loading branch information
Jcolomar authored Jul 30, 2017
2 parents f8cd6b4 + b093887 commit f3a5f13
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/manual_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ rm -f get-pip.py

(Please keep in mind that `master` is stable and tested but `dev` is bleeding edge. In the installation note below change `master` to `dev` if you want to get and use the latest version.)
```bash
git clone --recursive -b master https://github.com/PokemonGoF/PokemonGo-Bot
git clone --recursive -b master https://github.com/PokemonGoF/PokemonGo-Bot.git
cd PokemonGo-Bot
```

Expand Down Expand Up @@ -132,7 +132,7 @@ cd C:\Python27\
pip install --upgrade pip
cd ..
cd to PokemonGo-Bot directory
git clone --recursive -b dev https://github.com/PokemonGoF/PokemonGo-Bot
git clone --recursive -b dev https://github.com/PokemonGoF/PokemonGo-Bot.git
pip install --upgrade -r requirements.txt
git pull
cd web
Expand Down
9 changes: 7 additions & 2 deletions runMultiBot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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==1.2.0/' -e 's/[-_]//g' -e 's/==\(.*\)/:\1/' | awk '{print tolower($0)}'`)
required=(`cat requirements.txt | sed -e 's/.*pgoapi$/pgoapi==1.2.1/' -e 's/[-_]//g' -e 's/==\(.*\)/:\1/' | awk '{print tolower($0)}'`)
for package in ${required[@]}
do
if [[ ! (${installed[*]} =~ $package) ]];
Expand All @@ -30,6 +30,11 @@ then
./setup.sh -u
fi
fi
python MultiBot.py
while true
do
python MultiBot.py
echo `date`" Pokebot "$*" Stopped."
read -p "Press any button or wait 20 seconds to continue.
" -r -s -n1 -t 20
done
exit 0

0 comments on commit f3a5f13

Please sign in to comment.