--- a/fasterq_dump.xml	Tue Apr 27 08:54:57 2021 +0000
+++ b/fasterq_dump.xml	Fri Sep 03 16:17:17 2021 +0000
@@ -1,5 +1,6 @@
-<tool id="fasterq_dump" name="Faster Download and Extract Reads in FASTQ" version="@VERSION@+galaxy0" profile="18.01">
+<tool id="fasterq_dump" name="Faster Download and Extract Reads in FASTQ" version="@VERSION@+galaxy1" profile="18.01">
     <description>format from NCBI SRA</description>
+    <expand macro="bio_tools"/>
     <macros>
         <import>sra_macros.xml</import>
     </macros>
@@ -14,11 +15,8 @@
         ln -s '${input.file}' "\$acc" &&
     #end if
     @CONFIGURE_RETRY@
-    ## fetch from public s3 bucket if we can
-    export acc_or_path="\$acc" &&
-    aws s3 cp --no-sign-request "s3://sra-pub-sars-cov2/run/\$acc/\$acc" "\$acc.sra" 2>&1 | tee '$log' && export acc_or_path="\$acc.sra"|| true &&
     while [ \$SRA_PREFETCH_ATTEMPT -le \$SRA_PREFETCH_RETRIES ] ; do
-        fasterq-dump "\$acc_or_path" -e \${GALAXY_SLOTS:-1}
+        fasterq-dump "\$acc" -e \${GALAXY_SLOTS:-1}
         $adv.split
         #if str( $adv.minlen ) != "":
             --min-read-len "$adv.minlen"
@@ -181,19 +179,6 @@
                 </element>
             </output_collection>
         </test>
-        <test expect_num_outputs="4">
-             <!-- test accession downloaded from public bucket -->
-            <param name="input_select" value="accession_number"/>
-            <param name="accession" value="SRR11859153"/>
-            <output_collection name="output_collection" type="list" count="1">
-                <element name="SRR11859153" file="SRR11859153.fastq.gz" decompress="True"/>
-            </output_collection>
-            <output name="log">
-                <assert_contents>
-                    <has_text text="download: s3://sra-pub-sars-cov2/"/>
-                </assert_contents>
-            </output>
-        </test>
     </tests>
     <help><![CDATA[
 **What it does?**
@@ -259,7 +244,7 @@
 
 
 .. _fastq: https://en.wikipedia.org/wiki/FASTQ_format
-.. _fastq-dump: https://ncbi.github.io/sra-tools/fastq-dump.html
+.. _fastq-dump: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=toolkit_doc&f=fastq-dump
 .. _fasterq-dump: https://github.com/ncbi/sra-tools/wiki/HowTo:-fasterq-dump
 .. _collection: https://galaxyproject.org/tutorials/collections/
 .. _link: https://trace.ncbi.nlm.nih.gov/Traces/sra/sra.cgi?view=studies