Преглед изворни кода

Move to using trackers within zeronet.conf

Bob Mottram пре 9 година
родитељ
комит
f138a2eb96
1 измењених фајлова са 18 додато и 7 уклоњено
  1. 18
    7
      src/zeronetavahi

+ 18
- 7
src/zeronetavahi Прегледај датотеку

45
     fi
45
     fi
46
 fi
46
 fi
47
 
47
 
48
-BOOTSTRAP_FILE=$ZERONET_INSTALL/bootstrap
49
 BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
48
 BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
50
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
49
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
51
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
50
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
52
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
51
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
52
+ZERONET_CONFIG=$ZERONET_INSTALL/zeronet.conf
53
 
53
 
54
 function create_index {
54
 function create_index {
55
     if [ -f $ZERONET_INDEX ]; then
55
     if [ -f $ZERONET_INDEX ]; then
119
     exit 1
119
     exit 1
120
 fi
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
 fi
124
 fi
125
 
125
 
126
+echo '[global]' > $ZERONET_CONFIG.new
127
+echo 'trackers =' >> $ZERONET_CONFIG.new
128
+
126
 state=0
129
 state=0
127
 address=""
130
 address=""
128
 peer=""
131
 peer=""
132
+tracker_ctr=0
129
 while IFS='' read -r line || [[ -n "$line" ]]; do
133
 while IFS='' read -r line || [[ -n "$line" ]]; do
130
     if [ ${state} -eq "2" ]; then
134
     if [ ${state} -eq "2" ]; then
131
         if [[ $line == *"address ="* ]]; then
135
         if [[ $line == *"address ="* ]]; then
132
             address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
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
             state=0
138
             state=0
139
+            tracker_ctr=$((tracker_ctr + 1))
135
         fi
140
         fi
136
     fi
141
     fi
137
     if [ ${state} -eq "1" ]; then
142
     if [ ${state} -eq "1" ]; then
238
 rm -f $TEMPFILE_BASE
243
 rm -f $TEMPFILE_BASE
239
 rm -f $TEMPFILE
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
 if [ -d $ZERONET_USER_HOME ]; then
254
 if [ -d $ZERONET_USER_HOME ]; then
244
-    sudo chown zeronet:zeronet $BOOTSTRAP_FILE
255
+    sudo chown zeronet:zeronet $ZERONET_CONFIG
245
 fi
256
 fi
246
 
257
 
247
 # make some html headers and footers
258
 # make some html headers and footers