fix untar output dir

modules/untar/main.nf

@@ -21,12 +21,18 @@ process UNTAR {
     def args  = task.ext.args ?: ''
     def args2 = task.ext.args2 ?: ''
     untar     = archive.toString() - '.tar.gz'
+
     """
+    mkdir output
+
     tar \\
+        -C output --strip-components 1 \\
         -xzvf \\
         $args \\
         $archive \\
-        $args2 \\
+        $args2
+
+    mv output ${untar}
 
     cat <<-END_VERSIONS > versions.yml
     "${task.process}":

tests/config/test_data.config

@@ -323,6 +323,8 @@ params {
                 test_sv_vcf                                   =  "${test_data_dir}/genomics/homo_sapiens/illumina/vcf/sv_query.vcf.gz"
 
                 test_pytor                                    = "${test_data_dir}/genomics/homo_sapiens/illumina/pytor/test.pytor"
+
+                test_flowcell                                 = "${test_data_dir}/genomics/homo_sapiens/illumina/bcl/flowcell.tar.gz"
             }
             'pacbio' {
                 primers                         = "${test_data_dir}/genomics/homo_sapiens/pacbio/fasta/primers.fasta"

tests/modules/untar/main.nf

@@ -12,3 +12,13 @@ workflow test_untar {
 
     UNTAR ( input )
 }
+
+
+workflow test_untar_different_output_path {
+    input = [
+        [],
+        file(params.test_data['homo_sapiens']['illumina']['test_flowcell'], checkIfExists: true)
+    ]
+
+    UNTAR ( input )
+}

tests/modules/untar/test.yml

@@ -1,5 +1,5 @@
-- name: untar
-  command: nextflow run ./tests/modules/untar -entry test_untar -c ./tests/config/nextflow.config -c ./tests/modules/untar/nextflow.config
+- name: untar test_untar
+  command: nextflow run ./tests/modules/untar -entry test_untar -c ./tests/config/nextflow.config  -c ./tests/modules/untar/nextflow.config
   tags:
     - untar
   files:
@@ -9,3 +9,11 @@
       md5sum: a033d00cf6759407010b21700938f543
     - path: output/untar/kraken2/taxo.k2d
       md5sum: 094d5891cdccf2f1468088855c214b2c
+
+- name: untar test_untar_different_output_path
+  command: nextflow run ./tests/modules/untar -entry test_untar_different_output_path -c ./tests/config/nextflow.config  -c ./tests/modules/untar/nextflow.config
+  tags:
+    - untar
+  files:
+    - path: output/untar/flowcell/RunInfo.xml
+      md5sum: 03038959f4dd181c86bc97ae71fe270a