Browse Source

Alter to use avahi scripts from toxid

Bob Mottram 9 years ago
parent
commit
41c0c6f449
1 changed files with 6 additions and 35 deletions
  1. 6
    35
      src/freedombone

+ 6
- 35
src/freedombone View File

@@ -8167,45 +8167,16 @@ function tox_avahi {
8167 8167
       exit 58432
8168 8168
   fi
8169 8169
   make install
8170
-
8171
-  # script to publish the tox user
8172
-  if [ ! -f /usr/bin/publish-to-avahi ]; then
8173
-      echo '#!/bin/bash' > /usr/bin/publish-to-avahi
8174
-  fi
8175
-  echo '' >> /usr/bin/publish-to-avahi
8176
-  echo "DATA_FILE=/home/$MY_USERNAME/.config/tox/data" >> /usr/bin/publish-to-avahi
8177
-  echo 'if [ ! -f $DATA_FILE ]; then' >> /usr/bin/publish-to-avahi
8178
-  echo '    exit 0' >> /usr/bin/publish-to-avahi
8179
-  echo 'fi' >> /usr/bin/publish-to-avahi
8180
-  echo '' >> /usr/bin/publish-to-avahi
8181
-  echo -n 'TOX_ID=$(toxid -u ' >> /usr/bin/publish-to-avahi
8182
-  echo "$MY_USERNAME)" >> /usr/bin/publish-to-avahi
8183
-  echo '' >> /usr/bin/publish-to-avahi
8184
-
8185
-  echo "echo \"<?xml version='1.0' standalone='no'?><!--*-nxml-*-->\" > /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8186
-  echo "echo '<!DOCTYPE service-group SYSTEM \"avahi-service.dtd\">' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8187
-  echo "echo '<service-group>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8188
-  echo -n 'echo "  <name replace-wildcards=' >> /usr/bin/publish-to-avahi
8189
-  echo -n "'yes'" >> /usr/bin/publish-to-avahi
8190
-  echo '>%h $TOX_ID</name>" >> /etc/avahi/services/tox.service' >> /usr/bin/publish-to-avahi
8191
-  echo "echo '  <service>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8192
-  echo "echo '    <type>_tox._tcp</type>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8193
-  echo "echo \"    <port>$TOX_PORT</port>\" >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8194
-  echo "echo '  </service>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8195
-  echo "echo '</service-group>' >> /etc/avahi/services/tox.service" >> /usr/bin/publish-to-avahi
8196
-
8197
-  echo '' >> /usr/bin/publish-to-avahi
8198
-  echo 'exit 0' >> /usr/bin/publish-to-avahi
8199
-  chmod +x /usr/bin/publish-to-avahi
8200
-
8201
-  publish-to-avahi
8202
-  systemctl restart avahi-daemon
8170
+  
8171
+  toxavahi
8203 8172
 
8204 8173
   # publish regularly
8205
-  if ! grep -Fxq "publish-to-avahi" /etc/crontab; then
8206
-      echo '* *       * * *   root    /usr/bin/publish-to-avahi > /dev/null' >> /etc/crontab
8174
+  if ! grep -Fxq "toxavahi" /etc/crontab; then
8175
+      echo '* *       * * *   root    toxavahi > /dev/null' >> /etc/crontab
8207 8176
   fi
8208 8177
 
8178
+  systemctl restart avahi-daemon
8179
+
8209 8180
   echo 'tox_avahi' >> $COMPLETION_FILE
8210 8181
 }
8211 8182