From e8cf91de279405bdc120b9f5a8887bfcc10166c8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 7 Sep 2016 22:47:01 +0100
Subject: [PATCH] Rename ipfs avahi service

---
 src/freedombone-app-ipfs   | 2 +-
 src/freedombone-image-mesh | 2 +-
 src/zeronetavahi           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs
index 609211af..47ac6464 100755
--- a/src/freedombone-app-ipfs
+++ b/src/freedombone-app-ipfs
@@ -573,7 +573,7 @@ function install_ipfs_go {
         fi
         # Add an avahi service
         function_check create_avahi_service
-        create_avahi_service ipfs "ipfs" udp $IPFS_PORT "$IPFS_PEER_ID"
+        create_avahi_service ipfs_id "ipfs_id" 'udp' $IPFS_PORT "$IPFS_PEER_ID:none"
         rm /tmp/ipfsid
     fi
 
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 0ca16c52..8f047739 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -815,7 +815,7 @@ function setup_ipfs {
         TOX_ID=$(su -c 'toxid' - $MY_USERNAME)
     fi
 
-    create_avahi_mesh_service "ipfs" "ipfs" "udp" "$IPFS_PORT" "${IPFS_PEER_ID}:${TOX_ID}"
+    create_avahi_mesh_service "ipfs_id" "ipfs_id" "udp" "$IPFS_PORT" "${IPFS_PEER_ID}:${TOX_ID}"
 
     echo "IPFS installed with ID ${IPFS_PEER_ID}" >> $INSTALL_LOG
 }
diff --git a/src/zeronetavahi b/src/zeronetavahi
index 127dee2c..bfb033c2 100755
--- a/src/zeronetavahi
+++ b/src/zeronetavahi
@@ -116,7 +116,7 @@ function ipfs_publish {
 }
 
 function ipfs_bootstrap {
-    cat $TEMPFILE_BASE | grep "IPFS\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
+    cat $TEMPFILE_BASE | grep "ipfs_id\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
 
     state=0
     address=""