Skip to content

Commit 6449fcf

Browse files
Fix amrfinderplus linter errors and quoting (#7939)
* amrfinderplus: fix linter error * fix quotes
1 parent bf75a61 commit 6449fcf

2 files changed

Lines changed: 11 additions & 15 deletions

File tree

tools/amrfinderplus/.lint_skip

Lines changed: 0 additions & 2 deletions
This file was deleted.

tools/amrfinderplus/amrfinderplus.xml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#*======================================
1414
CPU option
1515
======================================*#
16-
--threads \${GALAXY_SLOTS:-1}
16+
--threads "\${GALAXY_SLOTS:-1}"
1717
#*======================================
1818
DATABASE
1919
======================================*#
@@ -22,29 +22,29 @@
2222
INPUT TYPE
2323
======================================*#
2424
#if $input_option.input_mode.input_select == 'nucleotide'
25-
--nucleotide $input_option.input_mode.nucleotide_input
25+
--nucleotide '$input_option.input_mode.nucleotide_input'
2626
#if $input_option.input_mode.nucleotide_flank5_size > 0
2727
--nucleotide_flank5_size $input_option.input_mode.nucleotide_flank5_size
2828
--nucleotide_flank5_output 'amrfinderplus_flanking_sequence_output.fasta'
2929
#end if
3030
--nucleotide_output 'amrfinderplus_nucleotide_output.fasta'
3131
#elif $input_option.input_mode.input_select == 'protein'
32-
--protein $input_option.input_mode.protein_input
32+
--protein '$input_option.input_mode.protein_input'
3333
#if $input_option.input_mode.gff_annotation
34-
--gff $input_option.input_mode.gff_annotation
34+
--gff '$input_option.input_mode.gff_annotation'
3535
#end if
3636
#if $input_option.input_mode.annotation_format
3737
--annotation_format $input_option.input_mode.annotation_format
3838
#end if
3939
--protein_output 'amrfinderplus_protein_output.fasta'
4040
#else
41-
--nucleotide $input_option.input_mode.nucleotide_input
41+
--nucleotide '$input_option.input_mode.nucleotide_input'
4242
#if $input_option.input_mode.nucleotide_flank5_size and $input_option.input_mode.nucleotide_flank5_size > 0
4343
--nucleotide_flank5_size $input_option.input_mode.nucleotide_flank5_size
4444
--nucleotide_flank5_output 'amrfinderplus_flanking_sequence_output.fasta'
4545
#end if
46-
--protein $input_option.input_mode.protein_input
47-
--gff $input_option.input_mode.gff_annotation
46+
--protein '$input_option.input_mode.protein_input'
47+
--gff '$input_option.input_mode.gff_annotation'
4848
--annotation_format $input_option.input_mode.annotation_format
4949
--nucleotide_output 'amrfinderplus_nucleotide_output.fasta'
5050
--protein_output 'amrfinderplus_protein_output.fasta'
@@ -147,8 +147,7 @@
147147
<param argument="--report_common" type="boolean" truevalue="--report_common" falsevalue=""
148148
label="Report proteins common to a taxonomy group (need the plus and organism options)"/>
149149
</when>
150-
<when value="">
151-
</when>
150+
<when value=""/>
152151
</conditional>
153152
</section>
154153
<!-- OPTIONS -->
@@ -185,9 +184,9 @@
185184
<option value="33">33 Cephalodiscidae mitochondrial</option>
186185
</param>
187186
<param argument="--plus" type="boolean" truevalue="--plus" falsevalue="" label="Add the plus genes to the report"/>
188-
<param argument="--report_all_equal" type="boolean" truevalue="--report_all_equal" falsevalue="" label="Report all equally-scoring BLAST and HMM matches"/>
189-
<param argument="--print_node" type="boolean" truevalue="--print_node" falsevalue="" label="print hierarchy node (family)"/>
190-
<param argument="--name" type="text" label="First column name" help="Text to be added as the first column 'name' to all rows of the report"/>
187+
<param argument="--report_all_equal" type="boolean" truevalue="--report_all_equal" falsevalue="" label="Report all equally-scoring BLAST and HMM matches"/>
188+
<param argument="--print_node" type="boolean" truevalue="--print_node" falsevalue="" label="print hierarchy node (family)"/>
189+
<param argument="--name" type="text" label="First column name" help="Text to be added as the first column 'name' to all rows of the report"/>
191190
</section>
192191
</inputs>
193192
<outputs>
@@ -256,7 +255,6 @@
256255
<param name="report_all_equal" value="true"/>
257256
<param name="print_node" value="true"/>
258257
<param name="name" value="test_2"/>
259-
<param name="log" value="true"/>
260258
</section>
261259
<output name="amrfinderplus_report" ftype="tabular">
262260
<assert_contents>

0 commit comments

Comments
 (0)