Skip to content

Commit

Permalink
Merge pull request #208 from pneerincx/master
Browse files Browse the repository at this point in the history
Minor update
  • Loading branch information
RoanKanninga authored May 17, 2021
2 parents 6a17517 + a736dc0 commit 29c9393
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
25 changes: 12 additions & 13 deletions bin/copyRawDataToPrm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -296,21 +296,26 @@ function splitSamplesheetPerProject() {
return
fi
#
# Create samplesheet per project unless
# * either only demultiplexing was requested via the samplesheet
# * or when disabled on the commandline by enabling "archiveMode".
# Process projects from samplesheet.
#

for _project in "${_projects[@]}"
do

#
# Track and Trace for project.
#
printf '%s\n' "${_project},${_run},,,,,," >> "${JOB_CONTROLE_FILE_BASE}.trace_post_projects.csv"
#
# Create samplesheet per project unless
# * either only demultiplexing was requested via the samplesheet
# * or when disabled on the commandline by enabling "archiveMode".
#
if [[ "${archiveMode}" == 'false' ]]; then
#
# Skip project if demultiplexing only.
#
if [[ $(contains "${_demultiplexOnly[@]}" "${_project}") == "y" ]]
then
log4Bash 'INFO' "${LINENO}" "${FUNCNAME:-main}" '0' "Demultiplexing Only for project: ${_project}, continue" \
log4Bash 'INFO' "${LINENO}" "${FUNCNAME:-main}" '0' "'Demultiplexing Only' detected for project: ${_project}; will not create project samplesheet."
continue
else
local _projectSampleSheet
Expand All @@ -321,20 +326,14 @@ function splitSamplesheetPerProject() {
log4Bash 'INFO' "${LINENO}" "${FUNCNAME:-main}" '0' "Created ${_projectSampleSheet}."
fi
fi
printf '%s\n' "${_project},${_run},,,,,," \
>> "${JOB_CONTROLE_FILE_BASE}.trace_post_projects.csv"

done

#
# Track and Trace.
# Track and Trace for flowcell/rawdata.
#

local _allProjects
_allProjects="${_projects[*]}"
_allProjects="${_allProjects// /,}"
printf '%s\n' "\"${_allProjects}\"" > "${JOB_CONTROLE_FILE_BASE}.trace_putFromFile_overview.csv"

#
# Move samplesheet to archive on sourceServerFQDN
#
Expand Down
2 changes: 1 addition & 1 deletion bin/pullRawDataFromDS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ else
gsBatchUploadCompleted='true'
fi
#
# Rsync everything but the .finished file: may be imcompletely uploaded batch,
# Rsync everything but the .finished file: may be incompletely uploaded batch,
# but we already rsync everything we've got so far.
#
log4Bash 'DEBUG' "${LINENO}" "${FUNCNAME:-main}" '0' "Rsyncing everything but the .finished file for ${gsBatch} ..."
Expand Down

0 comments on commit 29c9393

Please sign in to comment.