diff --git a/dist.ini b/dist.ini index 89fd767..1839c8f 100644 --- a/dist.ini +++ b/dist.ini @@ -3,7 +3,7 @@ author = Andrew J. Page license = GPL_3 copyright_holder = Wellcome Trust Sanger Institute copyright_year = 2013 -version = 3.11.2 +version = 3.11.3 main_module = lib/Bio/Roary.pm [MetaResources] diff --git a/lib/Bio/Roary/External/CheckTools.pm b/lib/Bio/Roary/External/CheckTools.pm index a580181..1a73cf5 100644 --- a/lib/Bio/Roary/External/CheckTools.pm +++ b/lib/Bio/Roary/External/CheckTools.pm @@ -62,23 +62,25 @@ 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)/, MINVER => "3", NEEDED => 0, }, - - # prank version also performs an update check so cant use it - 'prank' => { NEEDED => 0 }, + 'prank' => { + GETVER => "prank | grep -m 1 ^prank", + REGEXP => qr/prank v.(\d+)/, + NEEDED => 0, + }, # now just the standard unix tools we need 'grep' => { NEEDED => 1 },