|
@@ -159,26 +159,28 @@ function install_toxid {
|
159
|
159
|
|
160
|
160
|
function run_tox {
|
161
|
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
|
168
|
fi
|
|
169
|
+ lstox -f dht > /tmp/dht
|
|
170
|
+ sudo cp /tmp/dht $DHTNODES
|
167
|
171
|
fi
|
168
|
|
- lstox -f dht > /tmp/dht
|
169
|
|
- sudo cp /tmp/dht $DHTNODES
|
170
|
172
|
|
171
|
173
|
# get a list of peers
|
172
|
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
|
176
|
echo 'No peers found'
|
175
|
177
|
exit 0
|
176
|
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
|
180
|
PEER_TOX_ID=''
|
179
|
181
|
if [ $PEER_TOX_ID_LIST_COUNT -lt "2" ]; then
|
180
|
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
|
184
|
else
|
183
|
185
|
# choose a user from a list
|
184
|
186
|
echo ''
|
|
@@ -190,7 +192,7 @@ function run_tox {
|
190
|
192
|
ctr=$((ctr + 1))
|
191
|
193
|
done < "$PEER_TOX_ID_LIST"
|
192
|
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
|
196
|
fi
|
195
|
197
|
|
196
|
198
|
# if this is a valid ID
|