# HG changeset patch
# User Chris Cannam
# Date 1444231960 -3600
# Node ID ab0f2672341695ab6783348849185e3d7acbc32a
# Parent  6c1a501dea86e395d23e01bddb527a5b7414b2f0
Make scripts more robust to being run from a different directory

diff -r 6c1a501dea86 -r ab0f26723416 multiple_f0_estimation/silvet-live/doFramewiseF0-piano.sh
--- 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"
+
diff -r 6c1a501dea86 -r ab0f26723416 multiple_f0_estimation/silvet-live/doFramewiseF0.sh
--- 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"
+
diff -r 6c1a501dea86 -r ab0f26723416 multiple_f0_estimation/silvet-live/doNoteTracking-piano.sh
--- 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
diff -r 6c1a501dea86 -r ab0f26723416 multiple_f0_estimation/silvet/doFramewiseF0-piano.sh
--- 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"
+
diff -r 6c1a501dea86 -r ab0f26723416 multiple_f0_estimation/silvet/doFramewiseF0.sh
--- 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"
+