From e98c5e29e3cde1d4895791a3b53a3c586b9f7878 Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Sun, 25 Feb 2018 14:57:16 -0500 Subject: [PATCH] Update checkout-deps.sh. --- tools/checkout-deps.sh | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tools/checkout-deps.sh b/tools/checkout-deps.sh index f2b023734..44ea9e8f4 100755 --- a/tools/checkout-deps.sh +++ b/tools/checkout-deps.sh @@ -8,6 +8,7 @@ iswin=0 archive_ext=tar.gz decomp="tar zxf" +mysqlurlbase=https://cdn.mysql.com/archives/mysql-connector-c if [ `uname` = "Darwin" ]; then ismac=1 @@ -32,7 +33,7 @@ getmysql () elif [ `command -v curl` ]; then curl -o $mysqlfolder.$archive_ext $mysqlurl else - echo "Failed to locate wget or curl. Install one of these programs to download MySQL." + echo "Failed to locate wget or curl. Install one of these programs to download MySQL Connector/C." exit 1 fi $decomp $mysqlfolder.$archive_ext @@ -41,30 +42,30 @@ getmysql () fi } -# 32-bit MySQL -mysqlfolder=mysql-5.0 +# 32-bit MySQL Connector/C +mysqlfolder=mysql-connector-c if [ $ismac -eq 1 ]; then - mysqlver=mysql-5.5.28-osx10.5-x86 - mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext + mysqlver=mysql-connector-c-6.0.2-osx10.5-x86-32bit + mysqlurl=$mysqlurlbase/$mysqlver.$archive_ext elif [ $iswin -eq 1 ]; then - mysqlver=mysql-noinstall-5.0.24a-win32 - mysqlurl=https://cdn.mysql.com/archives/mysql-5.0/$mysqlver.$archive_ext + mysqlver=mysql-connector-c-noinstall-6.0.2-win32 + mysqlurl=$mysqlurlbase/$mysqlver.$archive_ext # The folder in the zip archive does not contain the substring "-noinstall", so strip it mysqlver=${mysqlver/-noinstall} else - mysqlver=mysql-5.6.15-linux-glibc2.5-i686 - mysqlurl=https://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext + mysqlver=mysql-connector-c-6.0.2-linux-glibc2.3-x86-32bit + mysqlurl=$mysqlurlbase/$mysqlver.$archive_ext fi getmysql -# 64-bit MySQL -mysqlfolder=mysql-5.0-x86_64 +# 64-bit MySQL Connector/C +mysqlfolder=mysql-connector-c-x86_64 if [ $ismac -eq 1 ]; then - mysqlver=mysql-5.5.28-osx10.5-x86_64 - mysqlurl=https://cdn.mysql.com/archives/mysql-5.5/$mysqlver.$archive_ext + mysqlver=mysql-connector-c-6.0.2-osx10.5-x86-64bit + mysqlurl=$mysqlurlbase/$mysqlver.$archive_ext elif [ $iswin -eq 0 ]; then - mysqlver=mysql-5.6.15-linux-glibc2.5-x86_64 - mysqlurl=https://cdn.mysql.com/archives/mysql-5.6/$mysqlver.$archive_ext + mysqlver=mysql-connector-c-6.0.2-linux-glibc2.3-x86-64bit + mysqlurl=$mysqlurlbase/$mysqlver.$archive_ext fi getmysql