Mercurial > hg > mirex2013
changeset 70:ab0f26723416
Make scripts more robust to being run from a different directory
| author | Chris Cannam |
|---|---|
| date | Wed, 07 Oct 2015 16:32:40 +0100 |
| parents | 6c1a501dea86 |
| children | a33f5dd9656d |
| files | multiple_f0_estimation/silvet-live/doFramewiseF0-piano.sh multiple_f0_estimation/silvet-live/doFramewiseF0.sh multiple_f0_estimation/silvet-live/doNoteTracking-piano.sh multiple_f0_estimation/silvet/doFramewiseF0-piano.sh multiple_f0_estimation/silvet/doFramewiseF0.sh |
| diffstat | 5 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/multiple_f0_estimation/silvet-live/doFramewiseF0-piano.sh Mon Sep 14 19:23:02 2015 +0100 +++ b/multiple_f0_estimation/silvet-live/doFramewiseF0-piano.sh Wed Oct 07 16:32:40 2015 +0100 @@ -9,6 +9,8 @@ exit 2 fi +set -eu + mkdir -p "$mydir"/out || exit 1 inbase=`basename "$infile"` @@ -41,6 +43,7 @@ ppoutfile="$mydir/out/$inbase.csv.sorted" cat "$poutfile" | sort -n > "$ppoutfile" -./frames.py "$ppoutfile" > "$outfile" +"$mydir"/frames.py "$ppoutfile" > "$outfile" echo "Done, output is in $outfile" +
--- a/multiple_f0_estimation/silvet-live/doFramewiseF0.sh Mon Sep 14 19:23:02 2015 +0100 +++ b/multiple_f0_estimation/silvet-live/doFramewiseF0.sh Wed Oct 07 16:32:40 2015 +0100 @@ -9,6 +9,8 @@ exit 2 fi +set -eu + mkdir -p "$mydir"/out || exit 1 inbase=`basename "$infile"` @@ -41,6 +43,7 @@ ppoutfile="$mydir/out/$inbase.csv.sorted" cat "$poutfile" | sort -n > "$ppoutfile" -./frames.py "$ppoutfile" > "$outfile" +"$mydir"/frames.py "$ppoutfile" > "$outfile" echo "Done, output is in $outfile" +
--- a/multiple_f0_estimation/silvet-live/doNoteTracking-piano.sh Mon Sep 14 19:23:02 2015 +0100 +++ b/multiple_f0_estimation/silvet-live/doNoteTracking-piano.sh Wed Oct 07 16:32:40 2015 +0100 @@ -32,7 +32,7 @@ # 2. Check the output file exists -poutfile="out/${inbase}.csv" +poutfile="$mydir/out/${inbase}.csv" if [ ! -f "$poutfile" ]; then echo "output file $poutfile not found! bailing out"; exit 1 fi
--- a/multiple_f0_estimation/silvet/doFramewiseF0-piano.sh Mon Sep 14 19:23:02 2015 +0100 +++ b/multiple_f0_estimation/silvet/doFramewiseF0-piano.sh Wed Oct 07 16:32:40 2015 +0100 @@ -9,6 +9,8 @@ exit 2 fi +set -eu + mkdir -p "$mydir"/out || exit 1 inbase=`basename "$infile"` @@ -41,6 +43,7 @@ ppoutfile="$mydir/out/$inbase.csv.sorted" cat "$poutfile" | sort -n > "$ppoutfile" -./frames.py "$ppoutfile" > "$outfile" +"$mydir"/frames.py "$ppoutfile" > "$outfile" echo "Done, output is in $outfile" +
--- a/multiple_f0_estimation/silvet/doFramewiseF0.sh Mon Sep 14 19:23:02 2015 +0100 +++ b/multiple_f0_estimation/silvet/doFramewiseF0.sh Wed Oct 07 16:32:40 2015 +0100 @@ -9,6 +9,8 @@ exit 2 fi +set -eu + mkdir -p "$mydir"/out || exit 1 inbase=`basename "$infile"` @@ -41,6 +43,7 @@ ppoutfile="$mydir/out/$inbase.csv.sorted" cat "$poutfile" | sort -n > "$ppoutfile" -./frames.py "$ppoutfile" > "$outfile" +"$mydir"/frames.py "$ppoutfile" > "$outfile" echo "Done, output is in $outfile" +