From 911505cd37ef0bb3dd32184a4c2fc8de9284875d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 13 Sep 2022 11:32:54 +0300 Subject: [PATCH] Provisioning: Fix Protobuf installation for Ubuntu 22.04 Cmake environment variable need to be read from .bash_profile (or .bashrc) instead of .profile with Ubuntu 22.04 Change-Id: Ic0589666e48946ba05366304407a0e5824b27a2c Reviewed-by: Liang Qi --- coin/provisioning/common/unix/install_protobuf.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index eb5dea24..fd275cc4 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -46,7 +46,11 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # Extract cmake path from the environment if uname -a |grep -q "Ubuntu"; then - source ~/.profile + if lsb_release -a |grep "Ubuntu 22.04"; then + source ~/.bash_profile + else + source ~/.profile + fi else source ~/.bashrc fi