Merge branch 'pRESTO' of github.com:common-workflow-language/workflow…

…s into pRESTO
common-workflow-library · Dec 9, 2015 · 1b628c6 · 1b628c6
2 parents 33a09ad + f4e2514
commit 1b628c6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/tools/pRESTO/.dockerignore b/tools/pRESTO/.dockerignore
@@ -1 +1 @@
-*
+*.cwl
diff --git a/tools/pRESTO/MaskPrimers.py.cwl b/tools/pRESTO/MaskPrimers.py.cwl
@@ -28,6 +28,7 @@ description: |
                    the --barcode flag is specified.
   
 requirements:
+  - import: node-engine.cwl
 
 inputs:
   - id: "#subcommand"
@@ -79,22 +80,33 @@ inputs:
 
   - id: "#outdir"
     type: string
-    inputBinding:
-      prefix: "--outdir"
-
-  - id: "#pipeline_log"
-    type: string
+    default:"outdir"
     inputBinding:
       prefix: "--outdir"
 
   - id: "#error_log"
     type: string
-    inputBinding:
-      prefix: "--outdir"
+    default: "Pipeline.err"
 
+  - id: "#pipeline_log"
+    type: string
+    default: "Pipeline.log"
 
 outputs:
   - id: "#outputs"
-    type: 
+    type: File
+    outputBinding:
+      glob:
+        engine: "node-engine.cwl"
+        script: >
+        $job.outname + '_quality-pass.fastq'
+
+stdout:
+  engine: cwl:JsonPointer
+  script: /job/pipeline_log
+
+# stderr:
+#   engine: cwl:JsonPointer
+#   script: /job/error_log
 
 # _primers-pass.fastq