diff --git a/preproc_fastq/trimgalore.sh b/preproc_fastq/trimgalore.sh index 8bd5613015db1df80a8410d16f4f37e01b3033a9..36e64d5f5eaaaf3d282bc8559a8cf3c0d73ac2d6 100644 --- a/preproc_fastq/trimgalore.sh +++ b/preproc_fastq/trimgalore.sh @@ -25,12 +25,20 @@ shift $(($OPTIND -1)) baseDir="`dirname \"$0\"`" # Check for mandatory options -if [[ -z $pair_id ]] || [[ -z $fq1 ]]; then +if [[ -z $pair_id ]]; then usage fi -fqs=("$@") +fqs='' +i=0 numfq=$# +while [[ $i -le $numfq ]] +do + fqs="$fqs $1" + i=$((i + 1)) + shift 1 +done + if [[ -f $fq1 ]] then fqs="$fq1" @@ -50,11 +58,11 @@ module load trimgalore/0.6.4 cutadapt/2.5 if [ $numfq > 1 ] then trim_galore --paired -q 25 --illumina --gzip --length 35 ${fqs} - mv ${r1base}_val_1.fq.gz ${pair_id}.trim.R1.fastq.gz - mv ${r2base}_val_2.fq.gz ${pair_id}.trim.R2.fastq.gz + mv *_val_1.fq.gz ${pair_id}.trim.R1.fastq.gz + mv *_val_2.fq.gz ${pair_id}.trim.R2.fastq.gz else trim_galore -q 25 --illumina --gzip --length 35 ${fqs} - mv ${r1base}_trimmed.fq.gz ${pair_id}.trim.R1.fastq.gz + mv *_trimmed.fq.gz ${pair_id}.trim.R1.fastq.gz cp ${pair_id}.trim.R1.fastq.gz ${pair_id}.trim.R2.fastq.gz fi diff --git a/variants/germline_vc.sh b/variants/germline_vc.sh index 9f598d9f68435b27b3759a5c8adffe361ce3c188..38ce8eeb0d1bd0cc26d1108f71372a9c7f343885 100755 --- a/variants/germline_vc.sh +++ b/variants/germline_vc.sh @@ -18,6 +18,7 @@ do p) pair_id=$OPTARG;; a) algo=$OPTARG;; t) rna=1;; + b) tbed=$OPTARG;; q) pon==$OPTARG;; h) usage;; esac @@ -131,6 +132,11 @@ then elif [[ $algo == 'strelka2' ]] then + opt='' + if [[ -n $tbed ]] + then + opt="--callRegions ${tbed}.gz" + fi if [[ $rna == 1 ]] then mode="--rna" @@ -143,7 +149,7 @@ then for i in *.bam; do gvcflist="$gvcflist --bam ${i}" done - configManta.py $gvcflist --referenceFasta ${reffa} $mode --runDir manta + configManta.py $gvcflist $opt --referenceFasta ${reffa} $mode --runDir manta manta/runWorkflow.py -m local -j $NPROC if [[ -f manta/results/variants/candidateSmallIndels.vcf.gz ]] then diff --git a/variants/somatic_vc.sh b/variants/somatic_vc.sh index a8b05942dd77323fd930d01a20e75ddd32f8ab04..b6ec6095d13432652ffb62c0d59451d5d111a551 100755 --- a/variants/somatic_vc.sh +++ b/variants/somatic_vc.sh @@ -93,11 +93,11 @@ module load htslib/gcc/1.8 if [ $algo == 'strelka2' ] then + module load strelka/2.9.10 manta/1.3.1 samtools/gcc/1.8 snpeff/4.3q vcftools/0.1.14 opt='' if [[ -n $tbed ]] then - opt="--callRegions ${tbed}.gz}" - module load strelka/2.9.10 manta/1.3.1 samtools/gcc/1.8 snpeff/4.3q vcftools/0.1.14 + opt="--callRegions ${tbed}.gz" fi mkdir manta configManta.py --normalBam ${normal} --tumorBam ${tumor} --referenceFasta ${reffa} $opt --runDir manta