|
@@ -114,7 +114,7 @@ fi
|
114
|
114
|
TEMPFILE_BASE=/tmp/tmpzeronetavahibase.txt
|
115
|
115
|
TEMPFILE=/tmp/tmpzeronetavahi.txt
|
116
|
116
|
avahi-browse -atr > $TEMPFILE_BASE
|
117
|
|
-cat $TEMPFILE_BASE | grep "Workstation\|hostname =\|address =\|port =" > $TEMPFILE
|
|
117
|
+cat $TEMPFILE_BASE | grep "hostname =\|address =\|port =" > $TEMPFILE
|
118
|
118
|
if [ ! -f $TEMPFILE ]; then
|
119
|
119
|
exit 1
|
120
|
120
|
fi
|
|
@@ -131,7 +131,7 @@ address=""
|
131
|
131
|
peer=""
|
132
|
132
|
tracker_ctr=0
|
133
|
133
|
while IFS='' read -r line || [[ -n "$line" ]]; do
|
134
|
|
- if [ ${state} -eq "2" ]; then
|
|
134
|
+ if [ ${state} -eq "1" ]; then
|
135
|
135
|
if [[ $line == *"address ="* ]]; then
|
136
|
136
|
address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
137
|
137
|
echo " http://$peer:$TRACKER_PORT/announce" >> $ZERONET_CONFIG.new
|
|
@@ -139,13 +139,8 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
|
139
|
139
|
tracker_ctr=$((tracker_ctr + 1))
|
140
|
140
|
fi
|
141
|
141
|
fi
|
142
|
|
- if [ ${state} -eq "1" ]; then
|
143
|
|
- if [[ $line == *"hostname ="* ]]; then
|
144
|
|
- peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
145
|
|
- state=2
|
146
|
|
- fi
|
147
|
|
- fi
|
148
|
|
- if [[ $line == *"Workstation"* && $line == "= "* ]]; then
|
|
142
|
+ if [[ $line == *"hostname ="* ]]; then
|
|
143
|
+ peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
149
|
144
|
state=1
|
150
|
145
|
fi
|
151
|
146
|
done < "$TEMPFILE"
|