Skip to content

Commit

Permalink
Merge pull request #379 from andrewjpage/version_fix
Browse files Browse the repository at this point in the history
Version fix
  • Loading branch information
andrewjpage authored Jan 12, 2018
2 parents da80059 + dfddaa7 commit 4fe10bb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion dist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
version = 3.11.3
main_module = lib/Bio/Roary.pm

[MetaResources]
Expand Down
16 changes: 9 additions & 7 deletions lib/Bio/Roary/External/CheckTools.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down

0 comments on commit 4fe10bb

Please sign in to comment.