changeset 46:d572322e2efe

Fix to .cat file check (was susceptible to DOS line-endings) and subrepo update
author Chris Cannam
date Thu, 07 Aug 2014 14:39:38 +0100
parents 6a072a24fed8
children fe753ff3d0b5
files .hgsubstate SCRIPTS/process.sh
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu Aug 07 14:05:33 2014 +0100
+++ b/.hgsubstate	Thu Aug 07 14:39:38 2014 +0100
@@ -5,7 +5,7 @@
 00cffb79d0e0d84e63914c0079601145fa6997ae pyin
 df9b98c6baf8766b52a16c15ee50b11837c0a599 qm-vamp-plugins
 6b23b827b108103ae9d1f412dc6c282a21302520 segmenter-vamp-plugin
-37c81fadfdced1d8ce9472d9f8ba3651f3c137f0 silvet
+92869203036f05bca97095ff339ab17e9656c853 silvet
 b835875739968beb870e7e09132aa361656a8a30 vamp-aubio-plugins
 81146373f024be1c82371f04262cf2ae1680cb61 vamp-libxtract-plugins
 8bc4ec815b6b695371dc9dda500191892ca5d2a7 vamp-onsetsds-plugin
--- a/SCRIPTS/process.sh	Thu Aug 07 14:05:33 2014 +0100
+++ b/SCRIPTS/process.sh	Thu Aug 07 14:39:38 2014 +0100
@@ -395,9 +395,7 @@
 	fi
     done
     if [ "$good" = "yes" ]; then
-	excess=$(VAMP_PATH="$dir" $hostwrapper \
-	    vamp-plugin-sdk/host/vamp-simple-host$hostext --list-ids | \
-	    grep '^vamp:' | \
+	excess=$(plugin_ids_in "$dir" | sed 's/^/vamp:/' | \
 	    cat "$dir"/*".cat" - | \
 	    sort | \
 	    perl -e 'while (<>) { 
@@ -450,6 +448,8 @@
     dir="$1"
     log=$(logfile_for envtest "$dir")
     good=yes
+    echo 
+    echo "Testing existence of README and accompanying files..."
     if ! ls -1 "$dir" | egrep -qi "^readme(.txt|)$"; then
 	echo "ERROR: no README file found" | tee -a "$log"
 	good=no