Merge branch 'hotfix/1.5.3'

cancerit · Jan 17, 2017 · ad67c96 · ad67c96
2 parents 87d248c + e83d3b7
commit ad67c96
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/perl/docs.tar.gz b/perl/docs.tar.gz
diff --git a/perl/lib/Sanger/CGP/Battenberg.pm b/perl/lib/Sanger/CGP/Battenberg.pm
@@ -25,7 +25,7 @@ use strict;
 
 use Const::Fast qw(const);
 use base 'Exporter';
-our $VERSION = '1.5.2';
+our $VERSION = '1.5.3';
 our @EXPORT = qw($VERSION);
 
 1;

diff --git a/setup.sh b/setup.sh
@@ -133,7 +133,7 @@ for i in "${perlmods[@]}" ; do
   echo -n "Installing build prerequisite $i..."
   (
     set -x
-    $INIT_DIR/perl/bin/cpanm -v --mirror http://cpan.metacpan.org -l $INST_PATH $i
+    $CPANM -v --mirror http://cpan.metacpan.org -l $INST_PATH $i
     set +x
     echo; echo
   ) >>$INIT_DIR/setup.log 2>&1
@@ -149,7 +149,7 @@ if ! ( perl -MExtUtils::MakeMaker -e 1 >/dev/null 2>&1); then
 fi
 (
   set -x
-  bin/cpanm -v --mirror http://cpan.metacpan.org --notest -l $INST_PATH/ --installdeps . < /dev/null
+  $CPANM -v --mirror http://cpan.metacpan.org --notest -l $INST_PATH/ --installdeps . < /dev/null
   set +x
 ) >>$INIT_DIR/setup.log 2>&1
 done_message "" "Failed during installation of core dependencies."