Bob Mottram 9 年之前
父節點
當前提交
dc148cbbad
共有 1 個檔案被更改,包括 12 行新增10 行删除
  1. 12
    10
      src/freedombone-mesh

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

159
 
159
 
160
 function run_tox {
160
 function run_tox {
161
     if [ -f $TOXIC_PATH ]; then
161
     if [ -f $TOXIC_PATH ]; then
162
-        # update bootstrap nodes
163
-        if [ -f $DHTNODES ]; then
164
-            if [ ! -f $DHTNODES.internet ]; then
165
-                sudo cp $DHTNODES $DHTNODES.internet
162
+        if [[ $SERVER_INSTALLATION == "no" ]]; then
163
+            # update bootstrap nodes
164
+            if [ -f $DHTNODES ]; then
165
+                if [ ! -f $DHTNODES.internet ]; then
166
+                    sudo cp $DHTNODES $DHTNODES.internet
167
+                fi
166
             fi
168
             fi
169
+            lstox -f dht > /tmp/dht
170
+            sudo cp /tmp/dht $DHTNODES
167
         fi
171
         fi
168
-        lstox -f dht > /tmp/dht
169
-        sudo cp /tmp/dht $DHTNODES
170
 
172
 
171
         # get a list of peers
173
         # get a list of peers
172
         PEER_TOX_ID_LIST=$(lstox | grep $AVAHI_DOMAIN | sort -u)
174
         PEER_TOX_ID_LIST=$(lstox | grep $AVAHI_DOMAIN | sort -u)
173
-        if [ ! $PEER_TOX_ID_LIST ]; then
175
+        if [ ! "$PEER_TOX_ID_LIST" ]; then
174
             echo 'No peers found'
176
             echo 'No peers found'
175
             exit 0
177
             exit 0
176
         fi
178
         fi
177
-        PEER_TOX_ID_LIST_COUNT=$(echo $PEER_TOX_ID_LIST | wc -l)
179
+        PEER_TOX_ID_LIST_COUNT=$(echo "$PEER_TOX_ID_LIST" | wc -l)
178
         PEER_TOX_ID=''
180
         PEER_TOX_ID=''
179
         if [ $PEER_TOX_ID_LIST_COUNT -lt "2" ]; then
181
         if [ $PEER_TOX_ID_LIST_COUNT -lt "2" ]; then
180
             # single peer
182
             # single peer
181
-            PEER_TOX_ID=$(echo $PEER_TOX_ID_LIST | awk -F ' ' '{print $3}')
183
+            PEER_TOX_ID=$(echo "$PEER_TOX_ID_LIST" | awk -F ' ' '{print $3}')
182
         else
184
         else
183
             # choose a user from a list
185
             # choose a user from a list
184
             echo ''
186
             echo ''
190
                 ctr=$((ctr + 1))
192
                 ctr=$((ctr + 1))
191
             done < "$PEER_TOX_ID_LIST"
193
             done < "$PEER_TOX_ID_LIST"
192
             read user_index
194
             read user_index
193
-            PEER_TOX_ID=$(echo $PEER_TOX_ID_LIST | tail -n+${user_index} | head -n1 | awk -F ' ' '{print $3}')
195
+            PEER_TOX_ID=$(echo "$PEER_TOX_ID_LIST" | tail -n+${user_index} | head -n1 | awk -F ' ' '{print $3}')
194
         fi
196
         fi
195
 
197
 
196
         # if this is a valid ID
198
         # if this is a valid ID