mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-20 05:19:40 +08:00
Provisioning: Use SetEnvVar helper function in scripts
Currently when adding an environment variable in provisioning we have to check if the system is Ubuntu and use .profile instead of .bashrc. This check should be done in a function so we don't have to duplicate it for every provisioning script separately. Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
@@ -38,6 +38,7 @@
|
||||
|
||||
source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="1.0.2g"
|
||||
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
|
||||
@@ -64,7 +65,8 @@ try
|
||||
pushd "$opensslHome"
|
||||
perl Configure shared android || throw $ExceptionConfig
|
||||
|
||||
echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
|
||||
|
||||
echo "OpenSSL for Android = $version" >> ~/versions.txt
|
||||
)
|
||||
catch || {
|
||||
|
||||
Reference in New Issue
Block a user