Merge branch 'master' of github.com:john30/ebusd

2017-02-23 18:09:27 +01:00
parent 3780aca37d 7d5dd27cf1
commit 510df554f5
1 changed files with 7 additions and 2 deletions
@@ -12,6 +12,11 @@ if [ "x$1" = "x-R" ]; then
  shift
 fi
 for i in `echo "f -F circuit,name" "$@"|nc 127.0.0.1 $port|sort -u|egrep ','`; do
-  ret=`echo "r ${readargs} -c" ${i%%,*} ${i##*,}|nc 127.0.0.1 $port|head -n 1`
-  echo ${i%%,*} ${i##*,} "=" $ret
+  circuit=${i%%,*}
+  name=${i##*,}
+  if [ -z "$circuit" ] || [ -z "$name" ] || [ "$circuit,$name" = "scan,id" ]; then
+    continue
+  fi
+  ret=`echo "r ${readargs} -c $circuit $name" |nc 127.0.0.1 $port|head -n 1`
+  echo "$circuit $name = $ret"
 done