Skip to content
This repository was archived by the owner on Jan 27, 2020. It is now read-only.

Commit 35ce177

Browse files
author
Szilveszter Juhos
authored
Merge pull request #657 from MaxUlysse/RunMultiQC
Fix RunMultiQC error
2 parents babcc93 + 0fc2252 commit 35ce177

2 files changed

Lines changed: 18 additions & 14 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1111

1212
- [#646](https://github.com/SciLifeLab/Sarek/pull/646) - Update [`pathfindr`](https://github.com/NBISweden/pathfindr) submodule
1313

14+
### `Fixed`
15+
16+
- [#657](https://github.com/SciLifeLab/Sarek/pull/657) - Fix `RunMultiQC.nf` bug
17+
1418
## [2.2.0] - Skårki - 2018-09-21
1519

1620
### `Added`

runMultiQC.nf

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,28 @@ process GetVersionAll {
5050
publishDir directoryMap.multiQC, mode: 'link'
5151

5252
input:
53-
file(versions) from Channel.fromPath("${directoryMap.version}/*").collect()
53+
file(versions) from Channel.fromPath("${directoryMap.version}/*").collect().ifEmpty(file ("empty"))
5454

5555
output:
56-
file ("tool_versions_mqc.yaml") into versionsForMultiQC
56+
file ("tool_versions_mqc.yaml") into versionsForMultiQC
5757

5858
when: !params.noReports
5959

6060
script:
6161
"""
62-
bcftools version > v_bcftools.txt
62+
bcftools version > v_bcftools.txt 2>&1 || true
6363
bwa &> v_bwa.txt 2>&1 || true
64-
configManta.py --version > v_manta.txt
65-
configureStrelkaGermlineWorkflow.py --version > v_strelka.txt
66-
echo "${params.version}" &> v_sarek.txt
67-
echo "${workflow.nextflow.version}" &> v_nextflow.txt
68-
fastqc -v > v_fastqc.txt
69-
freebayes --version > v_freebayes.txt
70-
gatk ApplyBQSR --help 2>&1 | grep Version: > v_gatk.txt
71-
multiqc --version &> v_multiqc.txt
72-
qualimap --version &> v_qualimap.txt
73-
samtools --version &> v_samtools.txt
74-
vcftools --version > v_vcftools.txt
64+
configManta.py --version > v_manta.txt 2>&1 || true
65+
configureStrelkaGermlineWorkflow.py --version > v_strelka.txt 2>&1 || true
66+
echo "${params.version}" &> v_sarek.txt 2>&1 || true
67+
echo "${workflow.nextflow.version}" &> v_nextflow.txt 2>&1 || true
68+
fastqc -v > v_fastqc.txt 2>&1 || true
69+
freebayes --version > v_freebayes.txt 2>&1 || true
70+
gatk ApplyBQSR --help 2>&1 | grep Version: > v_gatk.txt 2>&1 || true
71+
multiqc --version &> v_multiqc.txt 2>&1 || true
72+
qualimap --version &> v_qualimap.txt 2>&1 || true
73+
samtools --version &> v_samtools.txt 2>&1 || true
74+
vcftools --version &> v_vcftools.txt 2>&1 || true
7575
7676
scrape_tool_versions.py &> tool_versions_mqc.yaml
7777
"""

0 commit comments

Comments
 (0)