From 4c40c05ba6427826ee49463e3b8de1b099b205e5 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 26 Aug 2015 20:55:41 +0100
Subject: [PATCH] Skip package installs if in mesh mode

---
 src/freedombone-client | 20 ++++++++++++--------
 src/freedombone-mesh   |  7 +++++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/freedombone-client b/src/freedombone-client
index cfaac5aa..0b2d9d19 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -104,9 +104,11 @@ function configure_ssh_client {
 }
 
 function mesh_babel {
-  sudo apt-get -y install babeld
-  sudo apt-get -y install irssi mumble
-  sudo apt-get -y install toxic
+  if [ ! -f /tmp/meshtype ]; then
+      sudo apt-get -y install babeld
+      sudo apt-get -y install irssi mumble
+      sudo apt-get -y install toxic
+  fi
 
   babel_script=/tmp/babel
 
@@ -188,11 +190,13 @@ function mesh_babel {
 }
 
 function mesh_batman {
-  sudo apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
-  sudo apt-get -y install python-dev libevent-dev ebtables python-pip
-  sudo apt-get -y install wireless-tools rfkill
-  sudo apt-get -y install irssi mumble
-  sudo apt-get -y install toxic
+  if [ ! -f /tmp/meshtype ]; then
+      sudo apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
+      sudo apt-get -y install python-dev libevent-dev ebtables python-pip
+      sudo apt-get -y install wireless-tools rfkill
+      sudo apt-get -y install irssi mumble
+      sudo apt-get -y install toxic
+  fi
 
   batman_script=/tmp/batman
 
diff --git a/src/freedombone-mesh b/src/freedombone-mesh
index 98c50e24..53901f36 100755
--- a/src/freedombone-mesh
+++ b/src/freedombone-mesh
@@ -146,13 +146,15 @@ if [ ! -f $MUMBLE_PATH ]; then
                     sudo cp $DHTNODES $DHTNODES.internet
                 fi
             fi
-            sudo lstox -f dht > $DHTNODES
+            lstox -f dht > /tmp/dht
+			sudo cp /tmp/dht $DHTNODES
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
                 echo "/add $PEER_TOX_ID
 " | $TOXIC_PATH -d
                 exit 0
             else
+				echo $PEER_TOX_ID
                 echo "Tox ID for $AVAHI_DOMAIN was not found"
                 exit 6
             fi
@@ -204,7 +206,8 @@ else
                     sudo cp $DHTNODES $DHTNODES.internet
                 fi
             fi
-            sudo lstox -f dht > $DHTNODES
+            lstox -f dht > /tmp/dht
+			sudo cp /tmp/dht $DHTNODES
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
                 echo "/add $PEER_TOX_ID