revise fastqc output

tasks/fastqc.wdl

@@ -2,6 +2,8 @@ task fastqc {
 	File read1
 	File read2
 	String docker
+	String read1name=sub(basename(read1),"\\.\\S+$", "")
+	String read2name=sub(basename(read2),"\\.\\S+$", "")
 	String cluster
 	String disk_size
 
@@ -20,9 +22,9 @@ task fastqc {
 		dataDisk: "cloud_ssd " + disk_size + " /cromwell_root/"
 	}
 	output {
-		File read1_html=sub(basename(read1), "\\.(fastq|fq)\\.gz$", "_fastqc.html")
-		File read1_zip=sub(basename(read1), "\\.(fastq|fq)\\.gz$", "_fastqc.zip")
-		File read2_html=sub(basename(read2), "\\.(fastq|fq)\\.gz$", "_fastqc.html")
-		File read2_zip=sub(basename(read2), "\\.(fastq|fq)\\.gz$", "_fastqc.zip")
+		File read1_html="${read1name}_fastqc.html"
+		File read1_zip="${read1name}_fastqc.zip"
+		File read2_html="${read2name}_fastqc.html"
+		File read2_zip="${read1name}_fastqc.zip"
 	}
 }