diff --git a/dockerfiles/melt/run_MELT_2.0.5.sh b/dockerfiles/melt/run_MELT_2.0.5.sh index f914c8ab6..16b0eaaca 100644 --- a/dockerfiles/melt/run_MELT_2.0.5.sh +++ b/dockerfiles/melt/run_MELT_2.0.5.sh @@ -19,7 +19,7 @@ set -euo pipefail ##### Usage statement usage(){ cat <10X) WGS data mapped with BWA. Positional arguments (all required): bam Full path to mapped bam file (bam.bai assumed accompanying the BAM) @@ -28,7 +28,6 @@ cat < "${RUN_DIR}/transposon_reference.list" + ls "${MELT_DIR}"/me_refs/Hg38/*zip | sed 's/\*//g' > "transposon_reference.list" GENE_BED_FILE="${MELT_DIR}/add_bed_files/Hg38/Hg38.genes.bed" elif [[ "$REF_VER" == "19" ]]; then - ls "${MELT_DIR}"/me_refs/1KGP_Hg19/*zip | sed 's/\*//g' > "${RUN_DIR}/transposon_reference.list" + ls "${MELT_DIR}"/me_refs/1KGP_Hg19/*zip | sed 's/\*//g' > "transposon_reference.list" GENE_BED_FILE="${MELT_DIR}/add_bed_files/1KGP_Hg19/hg19.genes.bed" fi ##### Create output directory if it doesn't exist. then run MELT Single -mkdir -p "${RUN_DIR}" && cd "${RUN_DIR}" java -Xmx"${JVM_MAX_MEM}" \ -jar "${MELT_DIR}/MELT.jar" \ Single \ @@ -99,6 +95,6 @@ java -Xmx"${JVM_MAX_MEM}" \ -r "${read_len}" \ -e "${mean_is}" \ -d "${MIN_CHR_LENGTH}" \ - -t "${RUN_DIR}/transposon_reference.list" \ + -t "transposon_reference.list" \ -n "${GENE_BED_FILE}" \ - -w "${RUN_DIR}" \ No newline at end of file + -w "." diff --git a/wdl/MELT.wdl b/wdl/MELT.wdl index 350fd0c63..1e4207d49 100644 --- a/wdl/MELT.wdl +++ b/wdl/MELT.wdl @@ -511,24 +511,6 @@ task RunMELT { # these locations should be stable MELT_DIR="/MELT" - # `cromwell_root` and `cromwell-executions` are the **default** - # root directory for cromwell deployments on GCP and Azure respectively. - # The last option, i.e., $PWD, is the fall back option if the - # default root directory of the cromwell instance was changed, - # however, it is not a reliable option as it fails on GCP. - # It does not seem Cromwell sets a runtime environment variable - # exposing the configured value of the root directory, - # which could have provided a portable solution for this. - # The following solution works with the Cromwell deployments - # we are currently using on GCP and Azure. - if [ -d "/cromwell_root" ]; then - CROMWELL_ROOT="/cromwell_root" - elif [ -d "/cromwell-executions" ]; then - CROMWELL_ROOT="/cromwell-executions" - else - CROMWELL_ROOT="$PWD" - fi - # these locations may vary based on MELT version number, so find them: MELT_ROOT=$(find "$MELT_DIR" -name "MELT.jar" | xargs -n1 dirname) MELT_SCRIPT=$(ls "$MELT_DIR/run_MELT"*.sh) @@ -541,7 +523,6 @@ task RunMELT { ~{read_length} \ ~{insert_size} \ "$MELT_ROOT" \ - "$CROMWELL_ROOT" \ ~{reference_version} cat "~{melt_standard_vcf_header}" \