--- a/scriptrunner.xml	Sat Jul 09 17:00:06 2016 -0400
+++ b/scriptrunner.xml	Sun Jul 22 13:38:01 2018 -0400
@@ -1,40 +1,40 @@
-<tool id="docker_scriptrunner" name="docker scriptrunner" version="1.1.6">
+<tool id="docker_scriptrunner" name="docker scriptrunner" version="0.1.7">
   <description>Runs scripts using docker</description>
   <macros>
     <import>macros.xml</import>
   </macros>
    <requirements>
-      <requirement type="package" version="1.8.1">docker-py</requirement>
+      <requirement type="package" version="3.4.1">docker-py</requirement>
   </requirements>
-  <command>
-    python "$__tool_directory__/scriptrunner.py"
-    --script_path "$runme"
-    --interpreter "$interpreter"
-    --user_email "$__user_email__"
-    #if $generate_simple_output.make_TAB=="yes":
-       --output_tab "$tab_file"
-    #end if
-    #if $make_HTML.value=="yes":
-      --output_dir "$html_file.files_path" --output_html "$html_file" --make_HTML "yes"
-    #else:
-       --output_dir "."
-    #end if
-    #if $additional_parameters != 'None':
-      #for i in $additional_parameters:
-	--additional_parameters
-        "$i.param_name, $i.param_value"
-      #end for
-    #end if
-    #if $input_files != 'None':
-       --input_tab 
-	#for i in $input_files:
-	  $i.input
-	#end for
-        #for i in $input_files:
-          --input_format "Any"
-        #end for
-    #end if
-    --docker_image "$docker_image" 
+  <command detect_errors="exit_code">
+python '$__tool_directory__/scriptrunner.py'
+--script_path '$runme'
+--interpreter '$interpreter'
+--user_email '$__user_email__'
+#if $generate_simple_output.make_file=="yes":
+   --output_file "$output_file"
+#end if
+#if $make_HTML.value=="yes":
+  --output_dir "$html_file.files_path" --output_html "$html_file" --make_HTML "yes"
+#else:
+   --output_dir "."
+#end if
+#if $additional_parameters != 'None':
+  #for i in $additional_parameters:
+    --additional_parameters
+    "$i.param_name, $i.param_value"
+  #end for
+#end if
+#if $input_files != 'None':
+   --input_file
+   #for i in $input_files:
+     $i.input
+   #end for
+   #for i in $input_files:
+     --input_format "Any"
+   #end for
+#end if
+--docker_image "$docker_image" 
   </command>
 <configfiles>
   <configfile name="runme">$dynScript</configfile>
@@ -64,8 +64,8 @@
         <option value="" selected="true">No, no HTML output file thanks</option>
     </param>
     <conditional name="generate_simple_output">
-      <param name="make_TAB" type="select" label="Create a new history output alongside the HTML file specified above" 
-           help="This is useful if your script creates a single new tabular file you want to appear in the history after the tool executes">
+      <param name="make_file" type="select" label="Create a new history output alongside the HTML file specified above"
+           help="This is useful if your script creates a single new file that you want to appear in the history after the tool executes">
           <option value="yes" selected="true">My script writes to a new history output</option>
           <option value="">I do not want a new history output file</option>
       </param>
@@ -89,7 +89,7 @@
         <options from_data_table="docker_scriptrunner_images"/>
     </param>
     <param name="dynScript" label="Copy and paste the script to be executed here" type="text" value="" area="True" size="8x120"  
-      help="Script must deal with two command line parameters: Path to input tabular file path (or 'None' if none selected) and path to output tabular history file (or 'None').">
+      help="Script must deal with two command line parameters: Path to input file path (or 'None' if none selected) and path to output tabular history file (or 'None').">
       <sanitizer>
          <valid initial="string.printable">
          </valid>
@@ -98,8 +98,8 @@
      </param>
   </inputs>
   <outputs>
-    <data format_source="input" name="tab_file">
-      <filter>generate_simple_output['make_TAB'] == "yes"</filter>
+    <data format_source="input" name="output_file">
+      <filter>generate_simple_output['make_file'] == "yes"</filter>
         <actions>
           <action type="format">
                 <option type="from_param" name="generate_simple_output.out_format" />
@@ -112,14 +112,14 @@
  </outputs>
 <tests>
     <test>
-        <param name='input_tab' value='tf2_test_in.xls' ftype='tabular' />
-        <param name="make_TAB" value="yes" />
-        <param name="make_HTML" value="yes" />
-        <param name="out_format" value="tabular" />
-        <param name="interpreter" value='python' />
+        <param name="input_file" value="tf2_test_in.xls" ftype="tabular"/>
+        <param name="make_file" value="yes"/>
+        <param name="make_HTML" value="yes"/>
+        <param name="out_format" value="tabular"/>
+        <param name="interpreter" value="python"/>
         <param name="runme" value="tf2_test_runme.py"/>
-        <output name='output1' file='tf2_test_out.xls' compare='diff' lines_diff = '10'/>
-        <output name='html_file' file="tf2_test.html" compare='diff' lines_diff = '10'/>
+        <output name="output_file" file="tf2_test_out.xls" compare="diff" lines_diff="10"/>
+        <output name="html_file" file="tf2_test.html" compare="diff" lines_diff="10"/>
     </test>
 </tests>
 <expand macro="help_macro" />