diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:10:00 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 14:10:44 +0100 |
| commit | 250e07e99accec41c37a0be5311c404dc22a0eac (patch) | |
| tree | 78a4602c69a55129ab7feb1d4137f05d075dbe27 /coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh | |
| parent | 18b5dbf7df629e3b92152d53d8db8dd8e7d8ba7f (diff) | |
| parent | a434f14bd93f387f5f981fcd7d27ce95384d1ce6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
Diffstat (limited to 'coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh')
| -rwxr-xr-x | coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh index b47f9705..a28e306f 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" @@ -52,5 +54,5 @@ sudo mkdir -p "/opt" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" -echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc +SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" echo "MySQL = 5.7.15" >> ~/versions.txt |