--- a/aacoverage.xml	Tue Aug 06 08:50:28 2019 -0400
+++ b/aacoverage.xml	Mon Jun 20 20:06:36 2022 +0000
@@ -1,13 +1,15 @@
-<tool id="aacoverage" name="Amino Acid Coverage" version="0.7.0">
+<tool id="aacoverage" name="Amino Acid Coverage" version="@TOOL_VERSION@+galaxy@VERSION_SUFFIX@">
     <description>Builds an aa census and returns its coverage</description>
-    <requirements>
-          <requirement type="package" version="0.7.0">quasitools</requirement>
-    </requirements>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="requirements"/>
     <command detect_errors="exit_code"><![CDATA[
 
-        ln -f -s ${input_bam.metadata.bam_index} ${input_bam}.bai &&
+        ln -s $input_bam '${input_bam.name}' &&
+        ln -s $input_bam.metadata.bam_index '${input_bam.name}.bai' &&
 
-        quasitools aacoverage $input_bam $ref_file $input_genes -o output.csv
+        quasitools aacoverage '${input_bam.name}' $ref_file $input_genes -o output.csv
 
     ]]></command>
     <inputs>
@@ -44,14 +46,5 @@
 A file with one entry per line with the AA position and the coverage at the position.
 
     ]]></help>
-    <citations>
-		<citation type="bibtex">
-			@misc{GitHubquasitoolsaacoverage,
-			title = {quasitools aacoverage},
-			publisher = {phac-nml},
-			journal = {GitHub repository},
-			url = {https://github.com/phac-nml/quasitools},
-			}
-		</citation>
-    </citations>
+    <expand macro="citations" />
 </tool>