Bob Mottram 10 年前
父节点
当前提交
6558b6e6bc
共有 1 个文件被更改,包括 14 次插入13 次删除
  1. 14
    13
      src/freedombone-mesh

+ 14
- 13
src/freedombone-mesh 查看文件

@@ -39,7 +39,7 @@ PEERS_FILE=/tmp/meshpeers.txt
39 39
 TOX_PORT=33445
40 40
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
41 41
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
42
-QTOX_INI='~/.config/tox/qtox.ini'
42
+QTOX_INI="/home/$USER/.config/tox/qtox.ini"
43 43
 
44 44
 # client or server installations sounds odd for a mesh, but this
45 45
 # indicates whether this is a dedicated mesh peer ("yes") or
@@ -159,7 +159,8 @@ function install_toxid {
159 159
 }
160 160
 
161 161
 function run_tox {
162
-    if [ -f $TOXIC_PATH ]; then
162
+    echo $QTOX_INI
163
+    if [[ -f $TOXIC_PATH || -f $QTOX_INI ]]; then
163 164
         if [[ $SERVER_INSTALLATION == "no" ]]; then
164 165
             # update bootstrap nodes
165 166
             if [ -f $DHTNODES ]; then
@@ -200,6 +201,7 @@ function run_tox {
200 201
         if [ ${#PEER_TOX_ID} -gt 30 ]; then
201 202
             # start client and make a friend request
202 203
             if [ -f $QTOX_INI ]; then
204
+                echo 'Launch qTox'
203 205
                 qtox &
204 206
             else
205 207
 
@@ -313,7 +315,7 @@ fi
313 315
 if [ ! -f $IRSSI_PATH ]; then
314 316
     if [ ! -f $TOXIC_PATH ]; then
315 317
         if [ -f $MUMBLE_PATH ]; then
316
-            MUMBLE_PATH &
318
+            $MUMBLE_PATH &
317 319
             exit 0
318 320
         fi
319 321
         echo 'You need irssi/mumble/toxic installed on your system'
@@ -379,16 +381,15 @@ if [[ $peer_index == 1 ]]; then
379 381
         echo 'Mumble may not be installed on this system'
380 382
         exit 5
381 383
     fi
382
-else
383
-    if [[ $peer_index == 2 ]]; then
384
-        run_tox
385
-    else
386
-        if [ -f $IRSSI_PATH ]; then
387
-            $IRSSI_PATH -c $AVAHI_DOMAIN -p $IRC_PORT -n $USER
388
-        else
389
-            echo 'Irssi/toxic/mumble may not be installed on this system'
390
-            exit 8
391
-        fi
384
+fi
385
+
386
+if [[ $peer_index == 2 ]]; then
387
+    run_tox
388
+fi
389
+
390
+if [[ $peer_index == 3 ]]; then
391
+    if [ -f $IRSSI_PATH ]; then
392
+        $IRSSI_PATH -c $AVAHI_DOMAIN -p $IRC_PORT -n $USER
392 393
     fi
393 394
 fi
394 395