Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 5 additions & 3 deletions subworkflows/local/prepare_genome/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -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([ [],[] ]),
Expand Down
Loading