diff options
| author | Patrick Lewis <pat@lo5t.com> | 2021-05-31 09:19:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 18:19:45 +0200 |
| commit | c95c593174d77f77a41be88258a78d088e4f1daf (patch) | |
| tree | 843bb43ec6bd7c1b154bc2574c0fcd38aedcd7f0 /apps/installer/includes | |
| parent | a91939132fd2ec427f9061a67d17129f76d85f46 (diff) | |
fix(Bash/Ubuntu): allow Boost install on minimal ubuntu 20.04 installs (#6037)
Diffstat (limited to 'apps/installer/includes')
| -rw-r--r-- | apps/installer/includes/os_configs/ubuntu.sh | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/apps/installer/includes/os_configs/ubuntu.sh b/apps/installer/includes/os_configs/ubuntu.sh index 949c8d0bca..33babf54e0 100644 --- a/apps/installer/includes/os_configs/ubuntu.sh +++ b/apps/installer/includes/os_configs/ubuntu.sh @@ -1,27 +1,29 @@ +if ! command -v lsb_release &>/dev/null ; then + sudo apt-get install -y lsb-release +fi -# if ! command -v lsb_release &>/dev/null ; then -# sudo apt-get install -y lsb-release -# fi - -# UBUNTU_VERSION=$(lsb_release -sr); +UBUNTU_VERSION=$(lsb_release -sr); -# Added repo for newest lib -sudo add-apt-repository -y ppa:mhier/libboost-latest sudo apt update # shared deps -sudo apt-get -y install make cmake clang curl unzip libmysqlclient-dev libace-dev ccache google-perftools - -# Insstall boost 1.74 from ppa:mhier/libboost-latest for all os versions -sudo apt-get -y install libboost1.74-dev +sudo apt-get -y install ccache clang cmake curl google-perftools libace-dev libmysqlclient-dev make unzip if [[ $CONTINUOUS_INTEGRATION || $DOCKER ]]; then - sudo apt-get -y install build-essential libtool cmake-data openssl libgoogle-perftools-dev \ - libssl-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev mysql-client \ - libncurses5-dev + sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get -y install build-essential cmake-data \ + libboost1.74-dev libbz2-dev libncurses5-dev libmysql++-dev libgoogle-perftools-dev libreadline6-dev libssl-dev libtool mysql-client \ + openssl zlib1g-dev else - sudo apt-get install -y git gcc g++ gdb gdbserver \ - libssl-dev libbz2-dev libreadline-dev libncurses-dev \ - mysql-server libace-6.* + case $UBUNTU_VERSION in + "20.04") + sudo apt-get install -y g++ gdb gdbserver gcc git \ + libace-6.* libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \ + libssl-dev mysql-server + ;; + *) + sudo add-apt-repository -y ppa:mhier/libboost-latest && sudo apt update && sudo apt-get install -y g++ gdb gdbserver gcc git \ + libace-6.* libboost-all-dev libbz2-dev libncurses-dev libreadline-dev \ + libssl-dev mysql-server + ;; + esac fi - |