Use multi-arg form of require_distro

This commit is contained in:
Hiro Asari 2018-01-09 20:50:38 -05:00
parent 4a14d2f62a
commit 9a59c8490a
2 changed files with 2 additions and 6 deletions

View file

@ -5,9 +5,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
fi
;;
"linux64" )
if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then
install_package "pypy2-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-linux64.tar.bz2#da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2" "pypy" verify_py27 ensurepip
elif require_distro "Ubuntu 16.04" 1>/dev/null 2>&1; then
if require_distro "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then
install_package "pypy2-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.10.0-linux64.tar.bz2#da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2" "pypy" verify_py27 ensurepip
else
{ echo

View file

@ -5,9 +5,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
fi
;;
"linux64" )
if require_distro "Ubuntu 14.04" 1>/dev/null 2>&1; then
install_package "pypy3-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.0-linux64.tar.bz2#aa4fb52fb858d973dd838dcf8d74f30705e5afdf1150acb8e056eb99353dfe77" "pypy" verify_py27 ensurepip
elif require_distro "Ubuntu 16.04" 1>/dev/null 2>&1; then
if require_distro "Ubuntu 14.04" "Ubuntu 16.04" 1>/dev/null 2>&1; then
install_package "pypy3-v5.10.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.10.0-linux64.tar.bz2#aa4fb52fb858d973dd838dcf8d74f30705e5afdf1150acb8e056eb99353dfe77" "pypy" verify_py27 ensurepip
else
{ echo