# HG changeset patch
# User mini
# Date 1412159064 -7200
# Node ID ae516605f4a5f5d1abeeb7bdbb8430526d1be018
# Parent  ca84a74ff567913d0ccc10263862d378dde4220d# Parent  bce06de6cea2ecfd8b088ac75ae9ceb9bd62002d
merge

diff -r bce06de6cea2 -r ae516605f4a5 strelka.xml
--- a/strelka.xml	Wed Oct 01 10:40:22 2014 +0200
+++ b/strelka.xml	Wed Oct 01 12:24:24 2014 +0200
@@ -2,7 +2,7 @@
   <!-- Made by Gregoire Seguin-Henry for geviteam in 2014 -->
   <description>Strelka</description>
   <requirements>
-    <requirement type="set_environment">SCRIPT_PATH</requirement>
+    <requirement type="set_environment">SCRIPT_PATH_STRELKA</requirement>
     <requirement type="package" version="0.1.18">samtools</requirement>
     <requirement type="package" version="0.1.11">vcftools</requirement>
   </requirements>
diff -r bce06de6cea2 -r ae516605f4a5 strelka_wrapper.py
--- a/strelka_wrapper.py	Wed Oct 01 10:40:22 2014 +0200
+++ b/strelka_wrapper.py	Wed Oct 01 12:24:24 2014 +0200
@@ -7,7 +7,6 @@
 """
 A wrapper script for running the GenomeAnalysisTK.jar commands.
 """
-
 from __future__ import print_function
 import sys, argparse, os, tempfile, subprocess, shutil
 from binascii import unhexlify
@@ -58,7 +57,6 @@
             my_Popen( command, "fasta_index_stderr", tmp_dir, "Error during indexation of fasta file :" + fasta_filename)
 
 def __main__():
-
     #Manage options
     parser = argparse.ArgumentParser()                                             
     parser.add_argument( '-t', '--tumorBam', help='path to tumor bam file', required = False )
@@ -96,7 +94,7 @@
     tmp_dir = tempfile.mkdtemp( prefix='tmp-strelkaAnalysis-' )
     config_ini = "%s/config.ini" % (tmp_dir)
 
-    #print("root_dir: " + root_dir + "\njob_dir :" + job_dir + "\nanalysis_dir :" + analysis_dir + "\nconfig_script :" + config_script + "\ntmp_dir :" + tmp_dir + "\nconfig_ini :" +  config_ini)
+    print("root_dir: " + root_dir + "\njob_dir :" + job_dir + "\nanalysis_dir :" + analysis_dir + "\nconfig_script :" + config_script + "\ntmp_dir :" + tmp_dir + "\nconfig_ini :" +  config_ini)
 
 
     #verifying eveything's ok
@@ -142,3 +140,5 @@
     my_Popen( cmd, "workflow_stderr", tmp_dir, "Error during workflow execution !")   
     print("**** completed workflow execution")
 
+if __name__=='__main__':
+    __main__()
diff -r bce06de6cea2 -r ae516605f4a5 tool_dependencies.xml
--- a/tool_dependencies.xml	Wed Oct 01 10:40:22 2014 +0200
+++ b/tool_dependencies.xml	Wed Oct 01 12:24:24 2014 +0200
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <tool_dependency>
   <set_environment version="1.0">
-     <environment_variable name="SCRIPT_PATH" action="set_to">$REPOSITORY_INSTALL_DIR</environment_variable>
+     <environment_variable name="SCRIPT_PATH_STRELKA" action="set_to">$REPOSITORY_INSTALL_DIR</environment_variable>
   </set_environment>
   <package name="samtools" version="0.1.18">
     <repository changeset_revision="171cd8bc208d" name="package_samtools_0_1_18" owner="devteam" toolshed="http://toolshed.g2.bx.psu.edu" />