[nifi-minifi-cpp] 03/03: MINIFICPP-1816 adapt bootstrap to Ubuntu 22.04

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

martinzink pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 2d978450419f008ce294382cfb5fb9894beb7ed9
Author: Marton Szasz <sz...@apache.org>
AuthorDate: Tue May 3 14:48:07 2022 +0200

    MINIFICPP-1816 adapt bootstrap to Ubuntu 22.04
    
    Closes #1319
    Signed-off-by: Martin Zink <ma...@apache.org>
---
 aptitude.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/aptitude.sh b/aptitude.sh
index 23abe159d..08c57d63c 100644
--- a/aptitude.sh
+++ b/aptitude.sh
@@ -23,7 +23,7 @@ verify_enable_platform(){
 add_os_flags() {
     CC=gcc
     CXX=g++
-    if [[ "$OS" = Ubuntu* ]]; then
+    if [[ "$OS" = Ubuntu* && "$OS_MAJOR" -lt 22 ]]; then
         CC=gcc-11
         CXX=g++-11
     fi
@@ -33,7 +33,7 @@ add_os_flags() {
 }
 bootstrap_cmake(){
     ## on Ubuntu install the latest CMake
-    if [[ "$OS" = Ubuntu* ]]; then
+    if [[ "$OS" = Ubuntu* && "$OS_MAJOR" -lt 22 ]]; then
         echo "Adding KitWare CMake apt repository..."
         sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates gnupg software-properties-common wget
         wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
@@ -44,7 +44,7 @@ bootstrap_cmake(){
 build_deps(){
     ## need to account for debian
     compiler_pkgs="gcc g++"
-    if [[ "$OS" = Ubuntu* ]]; then
+    if [[ "$OS" = Ubuntu* && "$OS_MAJOR" -lt 22 ]]; then
         sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
         compiler_pkgs="gcc-11 g++-11"
     fi