--- a/awk.xml	Sun Oct 06 08:22:36 2013 -0400
+++ b/awk.xml	Wed Jan 07 11:10:52 2015 -0500
@@ -1,10 +1,23 @@
-<tool id="tp_awk_tool" name="Text reformatting" version="0.1.1">
+<tool id="tp_awk_tool" name="Text reformatting" version="@BASE_VERSION@.0">
     <description>with awk</description>
-    <requirements>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="requirements">
         <requirement type="package" version="4.1.0">gnu_awk</requirement>
-    </requirements>
+    </expand>
+    <version_command>awk --version | head -n 1</version_command>
     <command>
-        awk --sandbox -v FS=\$'\t' -v OFS=\$'\t' --re-interval -f '$awk_script' '$input' &gt; '$output'
+<![CDATA[
+        awk
+            --sandbox
+            -v FS=\$'\t'
+            -v OFS=\$'\t'
+            --re-interval
+            -f '$awk_script'
+            "$input"
+        > "$output"
+]]>
     </command>
     <inputs>
         <param format="txt" name="input" type="data" label="File to process" />
@@ -15,26 +28,25 @@
                 </valid>
             </sanitizer>
         </param>
-  </inputs>
-  <tests>
+    </inputs>
+    <configfiles>
+        <configfile name="awk_script">
+            $url_paste
+        </configfile>
+    </configfiles>
+    <outputs>
+        <data format="input" name="output" metadata_source="input"/>
+    </outputs>
+    <tests>
       <test>
           <param name="input" value="unix_awk_input1.txt" />
+          <param name="awk_script" value="$2>0.5 { print $2*9, $1 }" />
           <output name="output" file="unix_awk_output1.txt" />
-          <param name="FS" value="tab" />
-          <param name="OFS" value="tab" />
-          <param name="file_data"  value="$2>0.5 { print $2*9, $1 }" />
       </test>
-  </tests>
-  <outputs>
-    <data format="input" name="output" metadata_source="input"/>
-  </outputs>
-  <configfiles>
-      <configfile name="awk_script">
-          $url_paste
-      </configfile>
-  </configfiles>
-  <help>
+    </tests>
 
+    <help>
+<![CDATA[
 **What it does**
 
 This tool runs the unix **awk** command on the selected data file.
@@ -111,6 +123,7 @@
 - **$** matches the end of a line or string.
 - **\|** Separates alternate possibilities. 
 
-
+@REFERENCES@
+]]>
   </help>
 </tool>