Merge branch 'master' of github.com:sanger-pathogens/Roary into versi…

…on_fix
sanger-pathogens · Jan 12, 2018 · dfddaa7 · dfddaa7
2 parents 19d5db2 + da80059
commit dfddaa7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/Bio/Roary/External/CheckTools.pm b/lib/Bio/Roary/External/CheckTools.pm
@@ -62,14 +62,14 @@ my %tools = (
     },
     'kraken' => {
         GETVER => "kraken -v | head -n 1",
-        REGEXP => qr/(\d+\.\d+\.\d+.*)/,
+        REGEXP => qr/(\d+\.\d+\.*\d*.*)/,
         NEEDED => 0,
     },
     'kraken-report' => {
-        GETVER => "kraken-report --version | head -n 1",
-        REGEXP => qr/Kraken version (\d+\.\d+\.*\d*.*)/,
+        GETVER => "kraken-report -v | head -n 1",
+        REGEXP => qr/(\d+\.\d+\.*\d*.*)/,
         NEEDED => 0,
-    },
+    },	
 	'Rscript'  => {
         GETVER => "Rscript --version 2>&1 | head -n 1",
         REGEXP => qr/R scripting front-end version ($BIDEC)/,