From fab9fddb980adf59ac032e33187134bedaad9fb3 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Thu, 20 Mar 2014 13:19:23 -0400 Subject: [PATCH] #199 rename mysql and mariadb repos --- scripts/common.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/common.sh b/scripts/common.sh index ca98f896cb5..82ab8f20db8 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -161,8 +161,7 @@ function parse_mysqlbuild() { if [ -z $jemalloc_tree ] ; then jemalloc_tree=$jemalloc_version; fi fi mysql_repo=$mysql_distro - # 5.6 is in another repo - if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_repo=mysql-5.6; fi + if [[ $mysql_version =~ ^([0-9]+\\.[0-9]+) ]] ; then mysql_repo=$mysql_distro-${BASH_REMATCH[1]}; else exitcode=1; fi else exitcode=1 fi @@ -176,7 +175,7 @@ function parse_mysql() { mysql_distro=${BASH_REMATCH[1]} mysql_version=${BASH_REMATCH[2]} mysql_repo=$mysql_distro - if [[ $mysql_distro = mysql && $mysql_version =~ ^5.6 ]] ; then mysql_repo=mysql-5.6; fi + if [[ $mysql_version =~ ^([0-9]+\\.[0-9]+) ]] ; then mysql_repo=$mysql_distro-${BASH_REMATCH[1]}; else exitcode=1; fi exitcode=0 else exitcode=1