diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 09:46:18 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-06 10:19:35 +0200 |
| commit | dd3d32d13cf03a9e6ca661408b7995e8493c6af4 (patch) | |
| tree | 019a40a309750b92dcc28ab2bccb76d1b574eddf /coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | |
| parent | cc8a7501f329fbfefd1584f18ac7ff413e2d0854 (diff) | |
| parent | 88525879919a3aa36d1753e8d4348201f2a44046 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qtdeclarative.txt
coin/provisioning/common/InstallPKGFromURL.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh index acd0bd74..a6563ae5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh @@ -73,8 +73,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 + echo "export PATH=\"$opensslTargetLocation/bin:\$PATH\"" >> ~/.bashrc + echo "export MANPATH=\"$opensslTargetLocation/share/man:\$MANPATH\"" >> ~/.bashrc 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 |