瀏覽代碼

Mesh script can also run on a 'server' (i.e. a dedicated peer)

Bob Mottram 9 年之前
父節點
當前提交
b7c8141ae5
共有 1 個文件被更改,包括 28 次插入10 次删除
  1. 28
    10
      src/freedombone-mesh

+ 28
- 10
src/freedombone-mesh 查看文件

40
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
40
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
41
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
41
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
42
 
42
 
43
+# client or server installations sounds odd for a mesh, but this
44
+# indicates whether this is a dedicated mesh peer ("yes") or
45
+# a 'client' such as a laptop or desktop machine with
46
+# the freedombone-client script installed
47
+SERVER_INSTALLATION="no"
48
+
43
 function install_toxcore {
49
 function install_toxcore {
44
     if [ -f /etc/tox-bootstrapd.conf ]; then
50
     if [ -f /etc/tox-bootstrapd.conf ]; then
45
         return
51
         return
207
     fi
213
     fi
208
 }
214
 }
209
 
215
 
210
-if [ ! -f /usr/bin/batman ]; then
211
-    freedombone-client
216
+if [ -f /var/lib/batman ]; then
217
+    SERVER_INSTALLATION="yes"
218
+fi
219
+
220
+if [[ $SERVER_INSTALLATION == "no" ]]; then
221
+    if [ ! -f /usr/bin/batman ]; then
222
+        freedombone-client
223
+    fi
212
 fi
224
 fi
213
 
225
 
214
 # alternative toxic paths
226
 # alternative toxic paths
219
     DHTNODES=/usr/local/share/toxic/DHTnodes
231
     DHTNODES=/usr/local/share/toxic/DHTnodes
220
 fi
232
 fi
221
 
233
 
222
-if [ ! -f /tmp/meshtype ]; then
223
-    install_toxcore
224
-    install_toxid
225
-    sudo batman start
226
-    if [ ! "$?" = "0" ]; then
227
-        exit 2
234
+if [[ $SERVER_INSTALLATION == "no" ]]; then
235
+    if [ ! -f /tmp/meshtype ]; then
236
+        install_toxcore
237
+        install_toxid
238
+        sudo batman start
239
+        if [ ! "$?" = "0" ]; then
240
+            exit 2
241
+        fi
228
     fi
242
     fi
229
 fi
243
 fi
230
 
244
 
294
             exit 0
308
             exit 0
295
         fi
309
         fi
296
         echo 'You need irssi/mumble/toxic installed on your system'
310
         echo 'You need irssi/mumble/toxic installed on your system'
297
-        sudo batman stop
311
+        if [[ $SERVER_INSTALLATION == "no" ]]; then
312
+            sudo batman stop
313
+        fi
298
         exit 4
314
         exit 4
299
     fi
315
     fi
300
 fi
316
 fi
307
             exit 0
323
             exit 0
308
         fi
324
         fi
309
         echo 'You need irssi/mumble/toxic installed on your system'
325
         echo 'You need irssi/mumble/toxic installed on your system'
310
-        sudo batman stop
326
+        if [[ $SERVER_INSTALLATION == "no" ]]; then
327
+            sudo batman stop
328
+        fi
311
         exit 4
329
         exit 4
312
     fi
330
     fi
313
 fi
331
 fi