From c4a8bd34b41b2be26426ea01aafc69d41260cce5 Mon Sep 17 00:00:00 2001 From: Dirk Engling Date: Thu, 7 Mar 2019 16:41:03 +0100 Subject: Make postprocessing scripts more resilient --- parasort.sh | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'parasort.sh') diff --git a/parasort.sh b/parasort.sh index 6b54449..6565d61 100644 --- a/parasort.sh +++ b/parasort.sh @@ -7,14 +7,22 @@ function ctrl_c() { echo "Killed." } -cd output || exit 1 -mkdir -p ../sorted +if ! test -d work; then + printf "This directory contains no work/ directory.\n" + [ -d ../work ] && printf "(but .. does)\n" + exit 1 +fi -for a in *[05]; do echo "$a" >&2; ../merge_entries $a > ../sorted/$a; done & -for a in *[16]; do echo " $a" >&2; ../merge_entries $a > ../sorted/$a; done & -for a in *[27]; do echo " $a" >&2; ../merge_entries $a > ../sorted/$a; done & -for a in *[38]; do echo " $a" >&2; ../merge_entries $a > ../sorted/$a; done & -for a in *[49]; do echo " $a" >&2; ../merge_entries $a > ../sorted/$a; done & -for a in brken *_; do echo " $a" >&2; ../merge_entries $a > ../sorted/$a; done & +export PATH=${PATH}:`pwd -P`/bin/ + +mkdir -p work/sorted +cd work/output || exit 1 + +for a in *[05]; do echo "$a" >&2; merge_entries $a > ../sorted/$a; done & +for a in *[16]; do echo " $a" >&2; merge_entries $a > ../sorted/$a; done & +for a in *[27]; do echo " $a" >&2; merge_entries $a > ../sorted/$a; done & +for a in *[38]; do echo " $a" >&2; merge_entries $a > ../sorted/$a; done & +for a in *[49]; do echo " $a" >&2; merge_entries $a > ../sorted/$a; done & +for a in brken *_; do echo " $a" >&2; merge_entries $a > ../sorted/$a; done & wait -- cgit v1.2.3