fastq screen filename match

tasks/fastqscreen.wdl

@@ -3,8 +3,6 @@ task fastq_screen {
 	File read2
 	File screen_ref_dir
 	File fastq_screen_conf
-	String read1name=sub(basename(read1),"\\.(fastq|fq)\\.gz$", "")
-    String read2name=sub(basename(read2),"\\.(fastq|fq)\\.gz$", "")
 	String docker
 	String cluster_config
 	String disk_size
@@ -21,16 +19,16 @@ task fastq_screen {
 
 	runtime {
 		docker:docker
-    	cluster: cluster_config
-    	systemDisk: "cloud_ssd 40"
-    	dataDisk: "cloud_ssd " + disk_size + " /cromwell_root/"
+		cluster: cluster_config
+		systemDisk: "cloud_ssd 40"
+		dataDisk: "cloud_ssd " + disk_size + " /cromwell_root/"
 	}
 	output {
-		File png1 = "${read1name}_screen.png"
-		File txt1 = "${read1name}_screen.txt"
-		File html1 = "${read1name}_screen.html"
-		File png2 = "${read2name}_screen.png"
-		File txt2 = "${read2name}_screen.txt"
-		File html2 = "${read2name}_screen.html"
+		File png1 = sub(basename(read1), "\\.(fastq|fq)\\.gz$", "_screen.png")
+		File txt1 = sub(basename(read1), "\\.(fastq|fq)\\.gz$", "_screen.txt")
+		File html1 = sub(basename(read1), "\\.(fastq|fq)\\.gz$", "_screen.html")
+		File png2 = sub(basename(read2), "\\.(fastq|fq)\\.gz$", "_screen.png")
+		File txt2 = sub(basename(read2), "\\.(fastq|fq)\\.gz$", "_screen.txt")
+		File html2 = sub(basename(read2), "\\.(fastq|fq)\\.gz$", "_screen.html")
 	}
 }