From f999bbea1f83a2e20f4649ea9fff15eda85c9398 Mon Sep 17 00:00:00 2001
From: andrewjpage <andrewjpage@gmail.com>
Date: Fri, 12 Jan 2018 08:40:22 +0000
Subject: [PATCH] fix mafft and kraken version extraction

---
 dist.ini                             | 2 +-
 lib/Bio/Roary/External/CheckTools.pm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dist.ini b/dist.ini
index 17fdd3b..89fd767 100644
--- a/dist.ini
+++ b/dist.ini
@@ -3,7 +3,7 @@ author  = Andrew J. Page <ap13@sanger.ac.uk>
 license = GPL_3
 copyright_holder = Wellcome Trust Sanger Institute
 copyright_year   = 2013
-version = 3.11.1
+version = 3.11.2
 main_module = lib/Bio/Roary.pm
 
 [MetaResources]
diff --git a/lib/Bio/Roary/External/CheckTools.pm b/lib/Bio/Roary/External/CheckTools.pm
index dc01fd5..a580181 100644
--- a/lib/Bio/Roary/External/CheckTools.pm
+++ b/lib/Bio/Roary/External/CheckTools.pm
@@ -57,17 +57,17 @@ my %tools = (
     },
     'mafft' => {
         GETVER => "mafft --version < /dev/null 2>&1",
-        REGEXP => qr/(\d+\.\d+) /,
+        REGEXP => qr/(\d+\.\d+)/,
         NEEDED => 1,
     },
     'kraken' => {
-        GETVER => "kraken --version | head -n 1",
+        GETVER => "kraken -v | head -n 1",
         REGEXP => qr/(\d+\.\d+\.\d+.*)/,
         NEEDED => 0,
     },
     'kraken-report' => {
         GETVER => "kraken-report --version | head -n 1",
-        REGEXP => qr/(\d+\.\d+\.\d+.*)/,
+        REGEXP => qr/Kraken version (\d+\.\d+\.*\d*.*)/,
         NEEDED => 0,
     },
 	'Rscript'  => {