diff --git a/INSTALL.sh b/INSTALL.sh index 0848eea9..5a85844c 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -965,13 +965,13 @@ echo " install_samtools() { -local VER=1.6 +local VER=1.9 echo "------------------------------------------------------------------------------ Compiling samtools-$VER ------------------------------------------------------------------------------ " tar xvzf samtools-$VER.tar.gz -cd samtools-1.6 +cd samtools-$VER #make CFLAGS='-g -fPIC -Wall -O2' ./configure --prefix=$rootdir make @@ -1962,7 +1962,7 @@ then then samtools_installed_VER=`samtools 2>&1| grep 'Version'|perl -nle 'print $1 if m{Version: (\d+\.\d+)}'`; fi - if ( echo $samtools_installed_VER | awk '{if($1>=1.3) exit 0; else exit 1}' ) + if ( echo $samtools_installed_VER | awk '{if($1>=1.7) exit 0; else exit 1}' ) then echo "samtools is found" else diff --git a/scripts/microbial_profiling/microbial_profiling.pl b/scripts/microbial_profiling/microbial_profiling.pl index 57d2bfb8..7a096024 100755 --- a/scripts/microbial_profiling/microbial_profiling.pl +++ b/scripts/microbial_profiling/microbial_profiling.pl @@ -228,6 +228,7 @@ $cmd = ¶m_replace( $cmd, $file_info, $tools, $idx, $tool ); $qsub_cmd = ¶m_replace( $qsub_cmd, $file_info, $tools, $idx, $tool ); if ($tools->{system}->{RUN_TOOL_AS_JOB}){ + unlink $log; &_notify("[RUN_TOOL] [$tool] COMMAND: $qsub_cmd\n"); &_notify("[RUN_TOOL] [$tool] Logfile: $log\n"); #&_notify("$qsub_cmd -v EDGE_HOME=$ENV{EDGE_HOME} $script_dirname/script/$cmd\n"); diff --git a/scripts/microbial_profiling/microbial_profiling.settings.tmpl b/scripts/microbial_profiling/microbial_profiling.settings.tmpl index 5695418f..e5c99dc5 100644 --- a/scripts/microbial_profiling/microbial_profiling.settings.tmpl +++ b/scripts/microbial_profiling/microbial_profiling.settings.tmpl @@ -131,7 +131,7 @@ OUTPUT_DIR=%OUTDIR%/%SERIAL%_%PREFIX%/%TOOL% [pangia] -COMMAND=uge-pangia.sh -i %FASTQ% -p %PREFIX% -o %OUTPUT_DIR% -t %THREADS% -d "" -c -a -r -S -R -B -L +COMMAND=uge-pangia.sh -i %FASTQ% -p %PREFIX% -o %OUTPUT_DIR% -t %THREADS% -d "" -c -a '-ams ' -r -S -R -B -L OUTPUT_DIR=%OUTDIR%/%SERIAL%_%PREFIX%/%TOOL%