From 0638beffc08e3874b98b016f8931572969a0d66d Mon Sep 17 00:00:00 2001 From: Donald Burr Date: Fri, 20 Feb 2015 12:21:08 -0800 Subject: [PATCH] Fix room order/labels --- acatcher/mkacatcher_cpp.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/acatcher/mkacatcher_cpp.sh b/acatcher/mkacatcher_cpp.sh index 212fabf..e95e811 100755 --- a/acatcher/mkacatcher_cpp.sh +++ b/acatcher/mkacatcher_cpp.sh @@ -6,19 +6,15 @@ if [ ! -f "$1" ]; then exit 1 fi -NUM=0 -while read HOST; do - FOO="`grep $HOST\$ MASTER_LIST`" - if [ ! -z "$FOO" ]; then - HOST="`echo $FOO | cut -d\| -f3`" - MAC="`echo $FOO | cut -d\| -f1 | tr '[A-Z]' '[a-z]'`" - IP="`echo $FOO | cut -d\| -f2`" - >&2 echo found host $HOST mac $MAC ip $IP num $NUM - HEX="`echo "obase=16; $NUM" | bc | tr '[A-Z]' '[a-z]'`" - echo "\"[$HEX] $HOST\"," - NUM=$((NUM+1)) - fi -done < "$1" > acatcher.cxx.inc +while read HOST_LINE; do + HOST="`echo $HOST_LINE | cut -d\| -f1`" + MAC="`echo $HOST_LINE | cut -d\| -f2 | tr '[A-Z]' '[a-z]'`" + IP="`echo $HOST_LINE | cut -d\| -f3`" + NUM="`echo $HOST_LINE | cut -d\| -f4`" + HEX="`echo "obase=16; $NUM" | bc | tr '[A-Z]' '[a-z]'`" + >&2 echo found host $HOST mac $MAC ip $IP num $NUM hex $HEX + echo "\"[$HEX] $HOST\"," +done < HOSTS > acatcher.cxx.inc sed -e "s/_NUMHOSTS_/$NUM/" -e '/_HOSTS_/ {' -e 'r acatcher.cxx.inc' -e 'd' -e '}' < acatcher.cxx.template > acatcher.cxx