|
@@ -45,11 +45,11 @@ if [ ! -d $ZERONET_INSTALL ]; then
|
45
|
45
|
fi
|
46
|
46
|
fi
|
47
|
47
|
|
48
|
|
-BOOTSTRAP_FILE=$ZERONET_INSTALL/bootstrap
|
49
|
48
|
BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
|
50
|
49
|
FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
|
51
|
50
|
TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
|
52
|
51
|
ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
|
|
52
|
+ZERONET_CONFIG=$ZERONET_INSTALL/zeronet.conf
|
53
|
53
|
|
54
|
54
|
function create_index {
|
55
|
55
|
if [ -f $ZERONET_INDEX ]; then
|
|
@@ -119,19 +119,24 @@ if [ ! -f $TEMPFILE ]; then
|
119
|
119
|
exit 1
|
120
|
120
|
fi
|
121
|
121
|
|
122
|
|
-if [ -f $BOOTSTRAP_FILE.new ]; then
|
123
|
|
- rm -f $BOOTSTRAP_FILE.new
|
|
122
|
+if [ -f $ZERONET_CONFIG.new ]; then
|
|
123
|
+ rm -f $ZERONET_CONFIG.new
|
124
|
124
|
fi
|
125
|
125
|
|
|
126
|
+echo '[global]' > $ZERONET_CONFIG.new
|
|
127
|
+echo 'trackers =' >> $ZERONET_CONFIG.new
|
|
128
|
+
|
126
|
129
|
state=0
|
127
|
130
|
address=""
|
128
|
131
|
peer=""
|
|
132
|
+tracker_ctr=0
|
129
|
133
|
while IFS='' read -r line || [[ -n "$line" ]]; do
|
130
|
134
|
if [ ${state} -eq "2" ]; then
|
131
|
135
|
if [[ $line == *"address ="* ]]; then
|
132
|
136
|
address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
133
|
|
- echo "http $peer:$TRACKER_PORT/announce None" >> $BOOTSTRAP_FILE.new
|
|
137
|
+ echo " http://$peer:$TRACKER_PORT/announce" >> $ZERONET_CONFIG.new
|
134
|
138
|
state=0
|
|
139
|
+ tracker_ctr=$((tracker_ctr + 1))
|
135
|
140
|
fi
|
136
|
141
|
fi
|
137
|
142
|
if [ ${state} -eq "1" ]; then
|
|
@@ -238,10 +243,16 @@ echo '<ol>' >> $TOX_USERS_FILE.new
|
238
|
243
|
rm -f $TEMPFILE_BASE
|
239
|
244
|
rm -f $TEMPFILE
|
240
|
245
|
|
241
|
|
-cp -f $BOOTSTRAP_FILE.new $BOOTSTRAP_FILE
|
242
|
|
-rm -f $BOOTSTRAP_FILE.new
|
|
246
|
+if [ ${tracker_ctr} -gt "0" ]; then
|
|
247
|
+ cp -f $ZERONET_CONFIG.new $ZERONET_CONFIG
|
|
248
|
+else
|
|
249
|
+ if [ -f $ZERONET_CONFIG ]; then
|
|
250
|
+ rm -f $ZERONET_CONFIG
|
|
251
|
+ fi
|
|
252
|
+fi
|
|
253
|
+rm -f $ZERONET_CONFIG.new
|
243
|
254
|
if [ -d $ZERONET_USER_HOME ]; then
|
244
|
|
- sudo chown zeronet:zeronet $BOOTSTRAP_FILE
|
|
255
|
+ sudo chown zeronet:zeronet $ZERONET_CONFIG
|
245
|
256
|
fi
|
246
|
257
|
|
247
|
258
|
# make some html headers and footers
|