Merge pull request #1471 from nf-core/fix_sortmerna_index

Fix prepare_genome subworkflow for sortmerna

CHANGELOG.md

@@ -22,6 +22,7 @@ Special thanks to the following for their contributions to the release:
 - [PR #1470](https://github.com/nf-core/rnaseq/pull/1470) - Update subworkflow to account for fix to bad argument handling
 - [PR #1469](https://github.com/nf-core/rnaseq/pull/1469) - Minor docs fix
 - [PR #1459](https://github.com/nf-core/rnaseq/pull/1466) - Remove reference to unused "skip_sample_count" value in email templates
+- [PR #1471](https://github.com/nf-core/rnaseq/pull/1471) - Fix prepare_genome subworkflow for sortmerna
 
 ### Software dependencies
 

subworkflows/local/prepare_genome/main.nf

@@ -233,16 +233,18 @@ workflow PREPARE_GENOME {
     if ('sortmerna' in prepare_tool_indices) {
         ribo_db = file(sortmerna_fasta_list)
 
+        // SortMeRNA needs the rRNAs even if we're providing the index
+        ch_rrna_fastas = Channel.from(ribo_db.readLines())
+            .map { row -> file(row, checkIfExists: true) }
+
         if (sortmerna_index) {
             if (sortmerna_index.endsWith('.tar.gz')) {
                 ch_sortmerna_index = UNTAR_SORTMERNA_INDEX ( [ [:], sortmerna_index ] ).untar.map { it[1] }
                 ch_versions = ch_versions.mix(UNTAR_SORTMERNA_INDEX.out.versions)
             } else {
-                ch_sortmerna_index = Channel.value(file(sortmerna_index))
+                ch_sortmerna_index = Channel.value([[:], file(sortmerna_index)])
             }
         } else {
-            ch_rrna_fastas = Channel.from(ribo_db.readLines())
-                .map { row -> file(row, checkIfExists: true) }
 
             SORTMERNA_INDEX (
                 Channel.of([ [],[] ]),