Skip to content

Commit

Permalink
Fixed problem with output file path of FLASh.
Browse files Browse the repository at this point in the history
  • Loading branch information
V-Z committed Dec 6, 2017
1 parent b5bd541 commit 9e3fa86
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
9 changes: 7 additions & 2 deletions sondovac_part_a.sh
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@ workdirpath

# Check availability of all needed binaries

# Check if realpath is available
checktools realpath

# Check if paste is available
checktools paste

Expand Down Expand Up @@ -1145,11 +1148,13 @@ if [[ -n "$REFERENCEMT" && -n "$REFERENCEMT0" ]]; then
echo

# Combine the paired-end reads with FLASH - with mitochondrial reads
# Sanitize output variable for usage by FLASh (it always starts with './', thus absolute URL is not usable)
FLASHOUT2=$(realpath --relative-to=$WORKDIR $FLASHOUT)
echo "${REDF}Step 4 of the pipeline${NORM} - combination of paired-end reads."
echo
echo "${CYAF}Combining paired-end reads${NORM}"
echo
flash -o $FLASHOUT -M $FLASHM $FASTQNOMT.1.fq $FASTQNOMT.2.fq || {
flash -o $FLASHOUT2 -M $FLASHM $FASTQNOMT.1.fq $FASTQNOMT.2.fq || {
echo
echo "${REDF}${BOLD}Error!${NORM} ${CYAF}Combining paired-end reads failed.${NORM} Aborting. Check if files"
echo "${REDF}$REFERENCEMT${NORM}, ${REDF}$FASTQNOMT.1.fq${NORM} and ${REDF}$FASTQNOMT.2.fq${NORM} are correct."
Expand All @@ -1163,7 +1168,7 @@ if [[ -n "$REFERENCEMT" && -n "$REFERENCEMT0" ]]; then
echo
echo "${CYAF}Combining paired-end reads${NORM}"
echo
flash -o $FLASHOUT -M $FLASHM `echo $FASTQNOCP`_1.fq `echo $FASTQNOCP`_2.fq || {
flash -o $FLASHOUT2 -M $FLASHM `echo $FASTQNOCP`_1.fq `echo $FASTQNOCP`_2.fq || {
echo
echo "${REDF}${BOLD}Error!${NORM} ${CYAF}Combining paired-end reads failed.${NORM} Aborting. Check if files"
echo "${REDF}$REFERENCECP${NORM}, ${REDF}`echo $FASTQNOCP`_1.fq${NORM} and ${REDF}`echo $FASTQNOCP`_2.fq${NORM} are correct."
Expand Down
3 changes: 3 additions & 0 deletions sondovac_part_b.sh
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,9 @@ workdirpath

# Check availability of all needed binaries

# Check if realpath is available
checktools realpath

# Check if grep is available
checktools grep

Expand Down

1 comment on commit 9e3fa86

@V-Z
Copy link
Owner Author

@V-Z V-Z commented on 9e3fa86 Dec 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes issue #5.

Please sign in to comment.