Merge branch 'hotfix/v1.9.1'

ICGC-TCGA-PanCancer · Aug 5, 2015 · 86e4519 · 86e4519
2 parents ca830ae + a02c4f6
commit 86e4519
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,6 @@
+### 1.9.1
+* Changed final log folder to include sample name and analysis type, prevents clash when lots of data to same output loc.
+
 ### 1.9.0
 * Fix bugs #52 and #53
 * Modified bwa_mem.pl to accept multi-readgroup BAM as input

diff --git a/MYMETA.json b/MYMETA.json
@@ -57,5 +57,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "v1.9.0"
+   "version" : "v1.9.1"
 }
diff --git a/MYMETA.yml b/MYMETA.yml
@@ -39,4 +39,4 @@ requires:
   Test::Fatal: '0.013'
   Try::Tiny: '0.19'
   XML::Simple: '2.2'
-version: v1.9.0
+version: v1.9.1
diff --git a/bin/bwa_aln.pl b/bin/bwa_aln.pl
@@ -73,7 +73,7 @@
 sub cleanup {
   my $options = shift;
   my $tmpdir = $options->{'tmp'};
-  move(File::Spec->catdir($tmpdir, 'logs'), File::Spec->catdir($options->{'outdir'}, 'logs')) || die $!;
+  move(File::Spec->catdir($tmpdir, 'logs'), File::Spec->catdir($options->{'outdir'}, 'logs_bwaaln_'.$options->{'sample'})) || die $!;
   remove_tree $tmpdir if(-e $tmpdir);
 	return 0;
 }

diff --git a/bin/bwa_mem.pl b/bin/bwa_mem.pl
@@ -77,7 +77,7 @@
 sub cleanup {
   my $options = shift;
   my $tmpdir = $options->{'tmp'};
-  move(File::Spec->catdir($tmpdir, 'logs'), File::Spec->catdir($options->{'outdir'}, 'logs')) || die $!;
+  move(File::Spec->catdir($tmpdir, 'logs'), File::Spec->catdir($options->{'outdir'}, 'logs_bwamem_'.$options->{'sample'})) || die $!;
   remove_tree $tmpdir if(-e $tmpdir);
 	return 0;
 }

diff --git a/c/Makefile b/c/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.9.0
+VERSION=1.9.1
 
 #Compiler
 CC = gcc -O3 -DVERSION='"$(VERSION)"' -g

diff --git a/docs.tar.gz b/docs.tar.gz
diff --git a/lib/PCAP.pm b/lib/PCAP.pm
@@ -24,7 +24,7 @@ use strict;
 use Const::Fast qw(const);
 use base 'Exporter';
 
-our $VERSION = '1.9.0';
+our $VERSION = '1.9.1';
 our @EXPORT = qw($VERSION);
 
 const my $LICENSE =>
@@ -69,6 +69,7 @@ const my %UPGRADE_PATH => ( '0.1.0'  => 'biobambam,bwa,samtools',
                             '1.8.1'  => '',
                             '1.8.2'  => '',
                             '1.9.0'  => '',
+                            '1.9.1'  => '',
                           );
 
 sub license {