From 69f79d25d012f63a050d5bf8e4de64afc98ad2f2 Mon Sep 17 00:00:00 2001
From: Donald Burr <dburr@borg-cube.com>
Date: Thu, 19 Feb 2015 00:39:20 -0800
Subject: [PATCH] Squash bugies

---
 acatcher/provision_streamers.sh | 12 +++++-------
 acatcher/set_hostname.sh        |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/acatcher/provision_streamers.sh b/acatcher/provision_streamers.sh
index b8e4a37..21bd1a5 100755
--- a/acatcher/provision_streamers.sh
+++ b/acatcher/provision_streamers.sh
@@ -1,21 +1,19 @@
 #!/bin/sh
 NUM=0
 while read FOO; do
-  if ! echo $FOO | grep -q ^#; then
-    HOST="`echo $FOO | cut -d\| -f3`"
-    MAC="`echo $FOO | cut -d\| -f1 | tr '[A-Z]' '[a-z]'`"
-    IP="`echo $FOO | cut -d\| -f2`"
+    HOST="`echo $FOO | cut -d\| -f1`"
+    MAC="`echo $FOO | cut -d\| -f2 | tr '[A-Z]' '[a-z]'`"
+    IP="`echo $FOO | cut -d\| -f3`"
     if ! echo $HOST | egrep -q "(server|spare)"; then
       >&2 echo provisining host $HOST mac $MAC ip $IP num $NUM
       ssh pi@$HOST "if [ ! -d \$HOME/.ssh ]; then mkdir \$HOME/.ssh; fi; echo `cat $HOME/.ssh/id_rsa.pub` >> \$HOME/.ssh/authorized_keys; chmod 700 \$HOME/.ssh; chmod 644 \$HOME/.ssh/authorized_keys"
       for FILE in HOSTS SERVERIP stream.sh set_hostname.sh v4lcap.c; do scp $FILE pi@$HOST:$FILE; done
       ssh pi@$HOST "make v4lcap"
-      ssh pi@$HOST "bash set_hostname.sh"
+      ssh pi@$HOST "cd \$HOME && bash set_hostname.sh"
       ssh pi@$HOST "sudo reboot"
       NUM=$((NUM+1))
     elif echo $HOST | grep -q server; then
       >&2 echo found server at ip $IP
       echo $IP > SERVERIP
     fi
-  fi
-done < $HOME/Dropbox/CAMS
+done < HOSTS
diff --git a/acatcher/set_hostname.sh b/acatcher/set_hostname.sh
index 01082c6..d2b244a 100755
--- a/acatcher/set_hostname.sh
+++ b/acatcher/set_hostname.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-MAC=`ifconfig eth0 | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' | tr '[A-Z]' '[a-z]'`
+MAC=`/sbin/ifconfig eth0 | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}' | tr '[A-Z]' '[a-z]'`
 if grep -q $MAC HOSTS; then
   HOSTNAME=`grep $MAC HOSTS | cut -d\| -f1`
   echo "setting hostname to $HOSTNAME"