From f0fe997c711e6706476599e76dc8f1c51c70e117 Mon Sep 17 00:00:00 2001 From: Jimmy Song Date: Thu, 4 Mar 2021 10:38:50 -0800 Subject: [PATCH] remove pip and cpplint from bootstrap script --- build/bootstrap/bootstrap-ubuntu-18.04.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/bootstrap/bootstrap-ubuntu-18.04.sh b/build/bootstrap/bootstrap-ubuntu-18.04.sh index 363f312d..0b81bc7c 100644 --- a/build/bootstrap/bootstrap-ubuntu-18.04.sh +++ b/build/bootstrap/bootstrap-ubuntu-18.04.sh @@ -17,11 +17,6 @@ apt-get install -y libboost-all-dev libgtest-dev libproxy-dev libmsgsl-dev libss # libssl-dev also required but installed above because plugin uses libssl-dev directly apt-get install -y zlib1g-dev -apt install -y python-pip -pip install cpplint -# Installs to a non-standard location so add to PATH manually -export PATH=$PATH:~/.local/bin - # Cpprestsdk 2.10.2 is the latest publicly available version on Ubuntu 18.04 # Build and install v2.10.16 as it's the earliest version which supports url-redirection mkdir /tmp/cpprestsdk @@ -42,9 +37,14 @@ cmake /usr/src/gtest make make install -if [[ "$1" == "--no-docker" ]]; then - echo "Skipping docker install" +if [[ "$1" == "--no-tools" ]]; then + echo "Skipping tools install" else + apt install -y python-pip + pip install cpplint + # Installs to a non-standard location so add to PATH manually + export PATH=$PATH:~/.local/bin + # Install docker to enable building cross-arch for arm # Instructions located at: https://docs.docker.com/engine/install/ubuntu/ curl -fsSL https://get.docker.com -o get-docker.sh