@@ -165,20 +165,29 @@ rule count:
165165 """
166166 # Remove output directory
167167 # prior to running cellranger
168+ # perform additional checks to prevent accidental clean-up of existing run
168169 if [ -d '{params.id}' ]; then
169- if ! [ -f '{output.html}' ]; then
170- rm -rf '{params.id}/'
171- fi
170+ if ! [ -f '{output.html}' ]; then
171+ rm -rf '{params.id}/'
172+ cellranger count \\
173+ --id {params.id} \\
174+ --sample {params.sample} \\
175+ --transcriptome {params.transcriptome} \\
176+ --fastqs {params.fastqs} \\
177+ {params.excludeintrons} \\
178+ {params.createbam} \\
179+ 2>{log.err} 1>{log.log}
180+ fi
181+ else
182+ cellranger count \\
183+ --id {params.id} \\
184+ --sample {params.sample} \\
185+ --transcriptome {params.transcriptome} \\
186+ --fastqs {params.fastqs} \\
187+ {params.excludeintrons} \\
188+ {params.createbam} \\
189+ 2>{log.err} 1>{log.log}
172190 fi
173-
174- cellranger count \\
175- --id {params.id} \\
176- --sample {params.sample} \\
177- --transcriptome {params.transcriptome} \\
178- --fastqs {params.fastqs} \\
179- {params.excludeintrons} \\
180- {params.createbam} \\
181- 2>{log.err} 1>{log.log}
182191 """
183192
184193rule summaryFiles :
@@ -252,6 +261,10 @@ rule seuratQC:
252261 shell :
253262 """
254263 module load R/4.3.0
264+
265+ unset __RLIBSUSER
266+ unset R_LIBS_USER
267+
255268 Rscript {params.seurat} \\
256269 --workdir {params.outdir} \\
257270 --datapath {params.data} \\
@@ -277,6 +290,10 @@ rule seuratQCReport:
277290 shell :
278291 """
279292 module load R/4.3.0
293+
294+ unset __RLIBSUSER
295+ unset R_LIBS_USER
296+
280297 cd {params.tmpdir}
281298 cp {params.script} ./{params.sample}.Rmd
282299 R -e "rmarkdown::render('{params.sample}.Rmd', params=list(seuratdir='{params.seuratdir}', sample='{params.sample}', defaultfilter={params.filter}), output_file='{output.report}')"
@@ -307,6 +324,10 @@ rule cellFilterSummary:
307324 shell :
308325 """
309326 module load R/4.3.0
327+
328+ unset __RLIBSUSER
329+ unset R_LIBS_USER
330+
310331 Rscript {params.script} --datapath {params.seuratdir} --filename {params.filename} --output {output.cell_filter_summary}
311332 """
312333
@@ -324,6 +345,10 @@ rule seuratQCSummaryReport:
324345 shell :
325346 """
326347 module load R/4.3.0
348+
349+ unset __RLIBSUSER
350+ unset R_LIBS_USER
351+
327352 R -e "rmarkdown::render('{params.script}', params=list(seuratdir='{params.seuratdir}', samples={params.samples}, cellfilter='{input.cell_filter}'), output_file='{output.report}')"
328353 """
329354
0 commit comments