diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:43:08 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:44:48 +0100 |
commit | 351a519340d509300c754d0a62771a7f6e38ea4c (patch) | |
tree | d7181ebd455c7081f682bd0c82a988f25e0aa446 /coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | |
parent | 3c3d56c0cc3107a0b1d110bc1b61ee2f3cd05a90 (diff) | |
parent | 485244b016172445aa20bd31fb84fec6b7724cf5 (diff) |
Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh')
-rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index ccff42c3..c169799b 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -41,6 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" # shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" opensslVersion="1.0.2k" opensslFile="openssl-$opensslVersion.tar.gz" @@ -75,8 +77,8 @@ try sudo mkdir -p "$path" sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation || throw $ExceptionLN - echo "export PATH=\"$opensslTargetLocation/bin:\$PATH\"" >> ~/.bashrc - echo "export MANPATH=\"$opensslTargetLocation/share/man:\$MANPATH\"" >> ~/.bashrc + SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" + SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate |