diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2020-09-03 07:22:54 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-03 07:22:54 +0530 |
| commit | e6881e2a43f02e0abf22bf28abc46b3c2e406d84 (patch) | |
| tree | 78df2b3c6e1fc185f13199add4f784026c58f6b6 /tests/script/bootstrap/common.sh | |
| parent | 6f786a96b0acfb0c9b2d2f4e39911d2803088729 (diff) | |
| parent | 2329d19b97a3a3a115b6a414a6235f5d398bae2b (diff) | |
Merge pull request #640 from tuna-f1sh/travis
Fix Travis CI, add SAMD test support, support GNU grep on macOS
Diffstat (limited to 'tests/script/bootstrap/common.sh')
| -rw-r--r-- | tests/script/bootstrap/common.sh | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tests/script/bootstrap/common.sh b/tests/script/bootstrap/common.sh index c3cd90e..2b879b8 100644 --- a/tests/script/bootstrap/common.sh +++ b/tests/script/bootstrap/common.sh @@ -160,22 +160,14 @@ if [ -z $COMMON_SOURCED ]; then fi fi - if ! command -v python >/dev/null 2>&1; then + if ! command -v python3 >/dev/null 2>&1; then echo "Installing Python..." - _install "python" + _install "python3" fi - if ! command -v pip >/dev/null 2>&1; then + if ! command -v pip3 >/dev/null 2>&1; then echo "Installing Pip..." - if ! command -v easy_install >/dev/null 2>&1; then - _install "python-setuptools" - fi - - if ! command -v easy_install >/dev/null 2>&1; then - die "easy_install not available, can't install pip" - fi - - $SUDO_CMD easy_install pip + _install "python3-pip" fi PIP_SUDO_CMD= @@ -184,7 +176,7 @@ if [ -z $COMMON_SOURCED ]; then PIP_SUDO_CMD=$SUDO_CMD fi - $PIP_SUDO_CMD pip install --src dependencies --pre -Ur $BOOTSTRAP_DIR/pip-requirements.txt + $PIP_SUDO_CMD pip3 install --src dependencies --pre -Ur $BOOTSTRAP_DIR/pip-requirements.txt COMMON_SOURCED=1 fi |