diff --git a/files/bootstrap.sh b/files/bootstrap.sh index 82646de..a11cd00 100644 --- a/files/bootstrap.sh +++ b/files/bootstrap.sh @@ -8,16 +8,18 @@ if [[ -e $HOME/.bootstrapped ]]; then exit 0 fi -PYPY_VERSION=5.1.0 +PYPY_VERSION=5.6.0 -if [[ -e $HOME/pypy-$PYPY_VERSION-linux64.tar.bz2 ]]; then - tar -xjf $HOME/pypy-$PYPY_VERSION-linux64.tar.bz2 - rm -rf $HOME/pypy-$PYPY_VERSION-linux64.tar.bz2 +if [[ -e $HOME/pypy2-v$PYPY_VERSION-linux64.tar.bz2 ]]; then + tar -xjf $HOME/pypy2-v$PYPY_VERSION-linux64.tar.bz2 + rm -rf $HOME/pypy2-v$PYPY_VERSION-linux64.tar.bz2 else - wget -O - https://bitbucket.org/pypy/pypy/downloads/pypy-$PYPY_VERSION-linux64.tar.bz2 |tar -xjf - + wget -O - https://bitbucket.org/pypy/pypy/downloads/pypy2-v$PYPY_VERSION-linux64.tar.bz2 |tar -xjf - fi -mv -n pypy-$PYPY_VERSION-linux64 pypy +# remove, because otherwise this version will get placed into a subdir of an existing pypy/ +rm -rf pypy +mv -f pypy2-v$PYPY_VERSION-linux64 pypy ## library fixup mkdir -p pypy/lib @@ -27,10 +29,11 @@ mkdir -p $HOME/bin cat > $HOME/bin/python <