Parcourir la source

Install toxic client

Bob Mottram il y a 9 ans
Parent
révision
48c9d23971
2 fichiers modifiés avec 25 ajouts et 2 suppressions
  1. 13
    0
      src/freedombone-client
  2. 12
    2
      src/freedombone-mesh

+ 13
- 0
src/freedombone-client Voir le fichier

105
 
105
 
106
 function mesh_babel {
106
 function mesh_babel {
107
   sudo apt-get -y install babeld
107
   sudo apt-get -y install babeld
108
+  sudo apt-get -y install irssi mumble
109
+  sudo apt-get -y install toxic
108
 
110
 
109
   babel_script=/tmp/babel
111
   babel_script=/tmp/babel
110
 
112
 
189
   sudo apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
191
   sudo apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
190
   sudo apt-get -y install python-dev libevent-dev ebtables python-pip
192
   sudo apt-get -y install python-dev libevent-dev ebtables python-pip
191
   sudo apt-get -y install wireless-tools rfkill
193
   sudo apt-get -y install wireless-tools rfkill
194
+  sudo apt-get -y install irssi mumble
195
+  sudo apt-get -y install toxic
192
 
196
 
193
   batman_script=/tmp/batman
197
   batman_script=/tmp/batman
194
 
198
 
353
   echo '    else' >> $batman_script
357
   echo '    else' >> $batman_script
354
   echo '        service network-manager restart' >> $batman_script
358
   echo '        service network-manager restart' >> $batman_script
355
   echo '    fi' >> $batman_script
359
   echo '    fi' >> $batman_script
360
+  echo '    ' >> $batman_script
361
+  echo '    # restore tox bootstrap nodes for the internet' >> $batman_script
362
+  echo '    if [ -f /usr/share/toxic/DHTnodes.internet ]; then' >> $batman_script
363
+  echo '        mv /usr/share/toxic/DHTnodes.internet /usr/share/toxic/DHTnodes' >> $batman_script
364
+  echo '    fi' >> $batman_script
365
+  echo '    if [ -f /usr/local/share/toxic/DHTnodes.internet ]; then' >> $batman_script
366
+  echo '        mv /usr/local/share/toxic/DHTnodes.internet /usr/local/share/toxic/DHTnodes' >> $batman_script
367
+  echo '    fi' >> $batman_script
368
+  echo '    ' >> $batman_script
356
   echo '    rm -f /tmp/meshtype' >> $batman_script
369
   echo '    rm -f /tmp/meshtype' >> $batman_script
357
   echo '}' >> $batman_script
370
   echo '}' >> $batman_script
358
   echo '' >> $batman_script
371
   echo '' >> $batman_script

+ 12
- 2
src/freedombone-mesh Voir le fichier

141
 if [ ! -f $MUMBLE_PATH ]; then
141
 if [ ! -f $MUMBLE_PATH ]; then
142
     if [ ! -f $IRSSI_PATH ]; then
142
     if [ ! -f $IRSSI_PATH ]; then
143
         if [ -f $TOXIC_PATH ]; then
143
         if [ -f $TOXIC_PATH ]; then
144
-            lstox -f dht > $DHTNODES
144
+            if [ -f $DHTNODES ]; then
145
+                if [ ! -f $DHTNODES.internet ]; then
146
+                    sudo cp $DHTNODES $DHTNODES.internet
147
+                fi
148
+            fi
149
+            sudo lstox -f dht > $DHTNODES
145
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
150
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
146
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
151
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
147
                 echo "/add $PEER_TOX_ID
152
                 echo "/add $PEER_TOX_ID
194
 else
199
 else
195
     if [[ $peer_index == 2 ]]; then
200
     if [[ $peer_index == 2 ]]; then
196
         if [ -f $TOX_PATH ]; then
201
         if [ -f $TOX_PATH ]; then
197
-            lstox -f dht > $DHTNODES
202
+            if [ -f $DHTNODES ]; then
203
+                if [ ! -f $DHTNODES.internet ]; then
204
+                    sudo cp $DHTNODES $DHTNODES.internet
205
+                fi
206
+            fi
207
+            sudo lstox -f dht > $DHTNODES
198
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
208
             PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
199
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
209
             if [ ${#PEER_TOX_ID} -gt 30 ]; then
200
                 echo "/add $PEER_TOX_ID
210
                 echo "/add $PEER_TOX_ID