Mercurial > repos > devteam > picard

diff picard_MergeBamAlignment.xml @ 8:3a3234d7a2e8 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxyproject/tools-devteam/tree/master/tools/picard commit 00a7926c285bc4a339bd7deebf40b28f39c7d947-dirty
author devteam
date Thu, 16 Jul 2015 15:53:10 -0400
parents 3d4f1fa26f0e
children 5eaa8a968300
line wrap: on
line diff
--- a/picard_MergeBamAlignment.xml	Thu Jan 29 16:11:15 2015 -0500
+++ b/picard_MergeBamAlignment.xml	Thu Jul 16 15:53:10 2015 -0400
@@ -1,11 +1,9 @@
-<tool name="MergeBamAlignment" id="picard_MergeBamAlignment" version="1.126.0">
+<tool name="MergeBamAlignment" id="picard_MergeBamAlignment" version="@TOOL_VERSION@.0">
   <description>merge alignment data with additional info stored in an unmapped BAM dataset</description>
-  <requirements><requirement type="package" version="1.126.0">picard</requirement></requirements>
-  
   <macros>
     <import>picard_macros.xml</import>
   </macros>
-  
+  <expand macro="requirements" />
   <command>
     @java_options@
     #set $picard_dict = "localref.dict"
@@ -42,7 +40,7 @@
           READ1_ALIGNED_BAM="${dataset.read1_aligned_bam}"
         #end for
         #for $dataset in $aligned_or_read1_and_read2.read2_aligned_bams:
-          READ2_ALIGNED_BAM="${dataset.read1_aligned_bam}"
+          READ2_ALIGNED_BAM="${dataset.read2_aligned_bam}"
         #end for
       #else
         #for $dataset in $aligned_or_read1_and_read2.read1_aligned_bams: