From 7b4a4cf35bf5d799c9bb5addab6e1446aa2aaf4e Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sat, 11 Apr 2026 03:00:45 +0300 Subject: [PATCH] Coin: add SourceEnvVar to source env vars written by SetEnvVars This mainly moves scattered similar code that was already sourcing profile files to own script, so it can be re-used elsewhere. Change-Id: I11677226370fc52f50292d70c62cae5bd7c58d19 Reviewed-by: Dimitrios Apostolou --- coin/provisioning/common/unix/SourceEnvVars.sh | 15 +++++++++++++++ coin/provisioning/common/unix/install_grpc.sh | 16 ++-------------- .../provisioning/common/unix/install_protobuf.sh | 13 ++----------- 3 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 coin/provisioning/common/unix/SourceEnvVars.sh diff --git a/coin/provisioning/common/unix/SourceEnvVars.sh b/coin/provisioning/common/unix/SourceEnvVars.sh new file mode 100644 index 00000000..efc86727 --- /dev/null +++ b/coin/provisioning/common/unix/SourceEnvVars.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +# Copyright (C) 2026 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +# Sources the shell profile files where SetEnvVar.sh writes environment variables. + +if uname -a |grep -q "Ubuntu"; then + if lsb_release -a |grep "Ubuntu 22.04"; then + source ~/.bash_profile + else + source ~/.profile + fi +else + source ~/.bashrc +fi diff --git a/coin/provisioning/common/unix/install_grpc.sh b/coin/provisioning/common/unix/install_grpc.sh index 57d54f8a..b9cbb083 100755 --- a/coin/provisioning/common/unix/install_grpc.sh +++ b/coin/provisioning/common/unix/install_grpc.sh @@ -9,20 +9,8 @@ set -ex source "${BASH_SOURCE%/*}/DownloadURL.sh" # shellcheck source=./SetEnvVar.sh source "${BASH_SOURCE%/*}/SetEnvVar.sh" - -# Extract cmake path from the environment -if uname -a |grep -q "Ubuntu"; then - if lsb_release -a |grep -q "Ubuntu 22.04"; then -# shellcheck source=/dev/null - source ~/.bash_profile - else -# shellcheck source=/dev/null - source ~/.profile - fi -else -# shellcheck source=/dev/null - source ~/.bashrc -fi +# shellcheck source=./SourceEnvVars.sh +source "${BASH_SOURCE%/*}/SourceEnvVars.sh" version="1.50.1" sha1="be1b0c3dbfbc9714824921f50dffb7cf044da5ab" diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index 1f4ee37a..598bb703 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -6,17 +6,8 @@ source "${BASH_SOURCE%/*}/DownloadURL.sh" # shellcheck source=./SetEnvVar.sh source "${BASH_SOURCE%/*}/SetEnvVar.sh" - -# Extract cmake path from the environment -if uname -a |grep -q "Ubuntu"; then - if lsb_release -a |grep "Ubuntu 22.04"; then - source ~/.bash_profile - else - source ~/.profile - fi -else - source ~/.bashrc -fi +# shellcheck source=./SourceEnvVars.sh +source "${BASH_SOURCE%/*}/SourceEnvVars.sh" # This script will install Google's Protocal Buffers