Merge pull request #378 from andrewjpage/version_fix

fix mafft and kraken version extraction
sanger-pathogens · Jan 12, 2018 · da80059 · da80059
2 parents 9c2d391 + f999bbe
commit da80059
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dist.ini b/dist.ini
@@ -3,7 +3,7 @@ author  = Andrew J. Page <[email protected]>
 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
@@ -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'  => {