# HG changeset patch # User Chris Cannam # Date 1407420337 -3600 # Node ID fe753ff3d0b59cd23ad7b23b8cae746f357def49 # Parent d572322e2efec2b697ac2422febe6f80a65a52bc Simpler solution to .cat test diff -r d572322e2efe -r fe753ff3d0b5 SCRIPTS/process.sh --- a/SCRIPTS/process.sh Thu Aug 07 14:39:38 2014 +0100 +++ b/SCRIPTS/process.sh Thu Aug 07 15:05:37 2014 +0100 @@ -397,19 +397,14 @@ if [ "$good" = "yes" ]; then excess=$(plugin_ids_in "$dir" | sed 's/^/vamp:/' | \ cat "$dir"/*".cat" - | \ - sort | \ - perl -e 'while (<>) { - if (/::/) { - print if (!defined $plugid or !/^$plugid/); - } else { - chomp; $plugid = $_; - } - }') + sed 's/::.*//' | \ + sort | \ + uniq -u) if [ -n "$excess" ]; then - echo "ERROR: excess definitions in .cat file? $excess" | tee -a "$log" + echo "ERROR: excess or missing definitions in .cat file? $excess" | tee -a "$log" good=no else - echo "GOOD: no excess definitions in .cat files" | tee -a "$log" + echo "GOOD: no excess or missing definitions in .cat files" | tee -a "$log" fi fi [ "$good" = "yes" ]