free
/
freedombone
İzle 1
Yıldızla 0
Çatalla 0
Kod Sorunlar 0 Değişiklik İstekleri 0 Sürümler 0 Wiki Aktivite
Kaynağa Gözat

Tidying

Bob Mottram 8 yıl önce
ebeveyn
ec6f92a029
işleme
c318a3e910
No account linked to committer's email
1 değiştirilmiş dosya ile 2 ekleme ve 356 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 2
    356
      src/zeronetavahi

+ 2
- 356
src/zeronetavahi Dosyayı Görüntüle 

@@ -36,48 +36,15 @@ PROJECT_NAME='freedombone'
36 36 
 export TEXTDOMAIN=$PROJECT_NAME-zeronetavahi
37 37 
 export TEXTDOMAINDIR="/usr/share/locale"
38 38
39 
-MESH_INSTALL_DIR=/var/lib
40 
-WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh"
41 
-TRACKER_PORT=6969
42 
-ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet
43 39 
 MESH_USERNAME='fbone'
44 40 
 MY_USERNAME=$MESH_USERNAME
45 41
46 
-BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs
47 
-MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail
48 
-FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora
49 
-TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users
50 
-ID_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-id
51 
-ZERONET_INDEX=$ZERONET_INSTALL/mesh.html
52 
-ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
53 
-
54 42 
 IPFS_PORT=4001
55 43 
 IPFS_PATH=/usr/bin
56 44 
 IPFS_COMMAND=$IPFS_PATH/ipfs
57 45 
 IPFS_USERS_FILE=/home/$MY_USERNAME/.ipfs-users
58 46 
 IPFS_PUBLIC=/home/$MY_USERNAME/.ipfs-public
59 47
60 
-MY_BLOG_STR=$"My Blog"
61 
-MY_MAIL_STR=$"My Mail"
62 
-MY_FORUM_STR=$"My Forum"
63 
-MY_ID_STR=$"My ID Service"
64 
-YOUR_SITES_STR=$'Your Sites'
65 
-ON_THE_MESH_STR=$'On the Mesh'
66 
-
67 
-BLOGS_STR=$"Blogs"
68 
-MAIL_STR=$"Mail"
69 
-FORA_STR=$"Fora"
70 
-TOX_STR=$"Users on the Mesh"
71 
-ID_STR=$"ID Services"
72 
-NO_USERS_STR=$"No users found"
73 
-
74 
-# service names advertised by avahi
75 
-ENABLE_ZERONET=
76 
-ZERONET_BLOG_STR="ZeroNet Blog"
77 
-ZERONET_MAIL_STR="ZeroNet Mail"
78 
-ZERONET_FORUM_STR="ZeroNet Forum"
79 
-ZERONET_ID_STR="ZeroNet ID Service"
80 
-
81 48 
 # contains the output of the avahi command
82 49 
 TEMPFILE_BASE=$(mktemp /tmp/zeronetavahibase.XXXXXX)
83 50 
 TEMPFILE=$(mktemp /tmp/zeronetavahi.XXXXXX)
 
@@ -183,7 +150,7 @@ function detect_new_tox_users {
183 150 
     # Produce notifications if new users appear
184 151 
     if [ -f $PREV_TOX_USERS_FILE ]; then
185 152 
         while IFS='' read -r line || [[ -n "$line" ]]; do
186 
-            if [[ $line != "Failed*" && $line != "data "* ]]; then
153 
+            if [[ $line != "Failed*" && $line != "data "* && $line != "Anon "* && $line != "anon "* ]]; then
187 154 
                 if ! grep -q "$line" $PREV_TOX_USERS_FILE; then
188 155 
                     # get the nick of the user
189 156 
                     toxuser="$(echo "$line" | awk -F ' ' '{print $1}')"
 
@@ -209,97 +176,6 @@ function detect_tox_users {
209 176 
     lstox | awk -F ' ' '{$1=""; print $0}' | sed -e 's/^[[:space:]]*//' | sort -d > $TEMPFILE
210 177
211 178 
     detect_new_tox_users $TEMPFILE
212 
-
213 
-    toxctr=0
214 
-    echo '<ol type="square">' >> $TOX_USERS_FILE.new
215 
-    while IFS='' read -r line || [[ -n "$line" ]]; do
216 
-        if [[ $line != "Failed*" && $line != "data "* ]]; then
217 
-            echo "  <li>$line</li>" >> $TOX_USERS_FILE.new
218 
-            toxctr=$((toxctr + 1))
219 
-        fi
220 
-    done < "$TEMPFILE"
221 
-    if [ $toxctr -eq "0" ]; then
222 
-        echo "  <li>${NO_USERS_STR}</li>" >> $TOX_USERS_FILE.new
223 
-    fi
224 
-    echo '<ol>' >> $TOX_USERS_FILE.new
225 
-}
226 
-
227 
-function assemble_web_page {
228 
-    f="$1"
229 
-    fhome="$2"
230 
-    cat "${f}-header.html" "${f}.new" "${f}-footer.html" > "${f}.html"
231 
-    rm -f "${f}.new"
232 
-    if [ -d "${fhome}" ]; then
233 
-        sudo chown zeronet:zeronet "${f}.html"
234 
-    fi
235 
-}
236 
-
237 
-function create_index {
238 
-    blogaddress=$(cat /home/$MY_USERNAME/.config/zeronet/myblog)
239 
-    mailaddress=$(cat /home/$MY_USERNAME/.config/zeronet/mymail)
240 
-    forumaddress=$(cat /home/$MY_USERNAME/.config/zeronet/myforum)
241 
-    idaddress=$(cat /home/$MY_USERNAME/.config/zeronet/myzeroid)
242 
-    if [ -f $ZERONET_INDEX ]; then
243 
-        sed -i "s|.*${MY_BLOG_STR}.*|  <li><a href=\"${blogaddress}\">${MY_BLOG_STR}</a></li>|g" $ZERONET_INDEX
244 
-        sed -i "s|.*${MY_MAIL_STR}.*|  <li><a href=\"${mailaddress}\">${MY_MAIL_STR}</a></li>|g" $ZERONET_INDEX
245 
-        sed -i "s|.*${MY_FORUM_STR}.*|  <li><a href=\"${forumaddress}\">${MY_FORUM_STR}</a></li>|g" $ZERONET_INDEX
246 
-        sed -i "s|.*${MY_ID_STR}.*|  <li><a href=\"${idaddress}\">${MY_ID_STR}</a></li>|g" $ZERONET_INDEX
247 
-        return
248 
-    fi
249 
-    echo '<!DOCTYPE html>' > $ZERONET_INDEX
250 
-    echo '<html>' >> $ZERONET_INDEX
251 
-    echo '<head>' >> $ZERONET_INDEX
252 
-    echo "<title>$WEB_PAGE_TITLE</title>" >> $ZERONET_INDEX
253 
-    echo '</head>' >> $ZERONET_INDEX
254 
-    echo '<body>' >> $ZERONET_INDEX
255 
-    echo "<H1>$WEB_PAGE_TITLE</H1>" >> $ZERONET_INDEX
256 
-    echo '' >> $ZERONET_INDEX
257 
-    echo "<H2>${YOUR_SITES_STR}</H2>" >> $ZERONET_INDEX
258 
-    echo '' >> $ZERONET_INDEX
259 
-    echo '<ol type="square">' >> $ZERONET_INDEX
260 
-    echo "  <li><a href=\"${blogaddress}\">${MY_BLOG_STR}</a></li>" >> $ZERONET_INDEX
261 
-    echo "  <li><a href=\"${mailaddress}\">${MY_MAIL_STR}</a></li>" >> $ZERONET_INDEX
262 
-    echo "  <li><a href=\"${forumaddress}\">${MY_FORUM_STR}</a></li>" >> $ZERONET_INDEX
263 
-    echo "  <li><a href=\"${idaddress}\">${MY_ID_STR}</a></li>" >> $ZERONET_INDEX
264 
-#    echo "  <li><a href=\"http://localhost:5001/webui\">File Share</a></li>" >> $ZERONET_INDEX
265 
-    echo '</ol>' >> $ZERONET_INDEX
266 
-    echo '' >> $ZERONET_INDEX
267 
-    echo "<H2>${ON_THE_MESH_STR}</H2>" >> $ZERONET_INDEX
268 
-    echo '' >> $ZERONET_INDEX
269 
-    echo '<ol type="square">' >> $ZERONET_INDEX
270 
-    echo "  <li><a href=\"${BLOGS_FILE}.html\">${BLOGS_STR}</a></li>" >> $ZERONET_INDEX
271 
-    echo "  <li><a href=\"${MAIL_FILE}.html\">${MAIL_STR}</a></li>" >> $ZERONET_INDEX
272 
-    echo "  <li><a href=\"${FORUM_FILE}.html\">${FORA_STR}</a></li>" >> $ZERONET_INDEX
273 
-    echo "  <li><a href=\"${ID_FILE}.html\">${ID_STR}</a></li>" >> $ZERONET_INDEX
274 
-    echo "  <li><a href=\"${TOX_USERS_FILE}.html\">${TOX_STR}</a></li>" >> $ZERONET_INDEX
275 
-    echo '</ol>' >> $ZERONET_INDEX
276 
-    echo '' >> $ZERONET_INDEX
277 
-    echo '</body>' >> $ZERONET_INDEX
278 
-    echo '</html>' >> $ZERONET_INDEX
279 
-}
280 
-
281 
-function create_header {
282 
-    header_file=${1}-header.html
283 
-    if [ -f $header_file ]; then
284 
-        return
285 
-    fi
286 
-    echo '<!DOCTYPE html>' > $header_file
287 
-    echo '<html>' >> $header_file
288 
-    echo '<head>' >> $header_file
289 
-    echo "<title>$WEB_PAGE_TITLE - $2</title>" >> $header_file
290 
-    echo '<meta http-equiv="refresh" content="60">' >> $header_file
291 
-    echo '</head>' >> $header_file
292 
-    echo '<body>' >> $header_file
293 
-    echo "<H1>$2</H1>" >> $header_file
294 
-}
295 
-
296 
-function create_footer {
297 
-    footer_file=${1}-footer.html
298 
-    if [ -f $footer_file ]; then
299 
-        return
300 
-    fi
301 
-    echo '</body>' >> $footer_file
302 
-    echo '</html>' >> $footer_file
303 179 
 }
304 180
305 181 
 function avahi_extract_info {
 
@@ -311,249 +187,19 @@ function avahi_extract_info {
311 187 
     fi
312 188 
 }
313 189
314 
-function zeronet_detect {
315 
-    if [ -f $ZERONET_CONFIG.new ]; then
316 
-        rm -f $ZERONET_CONFIG.new
317 
-    fi
318 
-
319 
-    touch $ZERONET_CONFIG.new
320 
-
321 
-    state=0
322 
-    address=""
323 
-    peer=""
324 
-    tracker_ctr=0
325 
-    while IFS='' read -r line || [[ -n "$line" ]]; do
326 
-        if [ ${state} -eq "1" ]; then
327 
-            if [[ $line == *"address ="* ]]; then
328 
-                address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
329 
-                tracker_url="http://$peer:$TRACKER_PORT/announce"
330 
-                if ! grep -q "$tracker_url" $ZERONET_CONFIG.new; then
331 
-                    echo "$tracker_url" >> $ZERONET_CONFIG.new
332 
-                    tracker_ctr=$((tracker_ctr + 1))
333 
-                fi
334 
-                state=0
335 
-            fi
336 
-        fi
337 
-        if [[ $line == *"hostname ="* ]]; then
338 
-            peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
339 
-            state=1
340 
-        fi
341 
-    done < "$TEMPFILE"
342 
-}
343 
-
344 
-function zeronet_detect_blog {
345 
-    if [ -f $BLOGS_FILE.new ]; then
346 
-        rm -f $BLOGS_FILE.new
347 
-    fi
348 
-
349 
-    cat $TEMPFILE_BASE | grep "${ZERONET_BLOG_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
350 
-
351 
-    state=0
352 
-    address=""
353 
-    peer=""
354 
-    echo '<ol type="square">' >> $BLOGS_FILE.new
355 
-    while IFS='' read -r line || [[ -n "$line" ]]; do
356 
-        if [ ${state} -eq "3" ]; then
357 
-            if [[ $line == *"txt ="* ]]; then
358 
-                blog_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
359 
-                echo "  <li><a href=${blog_url}>${peer}</a></li>" >> $BLOGS_FILE.new
360 
-                state=0
361 
-            fi
362 
-        fi
363 
-        if [ ${state} -eq "2" ]; then
364 
-            if [[ $line == *"address ="* ]]; then
365 
-                address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
366 
-                state=3
367 
-            fi
368 
-        fi
369 
-        if [ ${state} -eq "1" ]; then
370 
-            if [[ $line == *"hostname ="* ]]; then
371 
-                peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
372 
-                state=2
373 
-            fi
374 
-        fi
375 
-        if [[ $line == *"${ZERONET_BLOG_STR}"* && $line == "= "* ]]; then
376 
-            state=1
377 
-        fi
378 
-    done < "$TEMPFILE"
379 
-    echo '</ol>' >> $BLOGS_FILE.new
380 
-}
381 
-
382 
-function zeronet_detect_mail {
383 
-    if [ -f $MAIL_FILE.new ]; then
384 
-        rm -f $MAIL_FILE.new
385 
-    fi
386 
-
387 
-    cat $TEMPFILE_BASE | grep "${ZERONET_MAIL_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
388 
-
389 
-    state=0
390 
-    address=""
391 
-    peer=""
392 
-    echo '<ol type="square">' >> $MAIL_FILE.new
393 
-    while IFS='' read -r line || [[ -n "$line" ]]; do
394 
-        if [ ${state} -eq "3" ]; then
395 
-            if [[ $line == *"txt ="* ]]; then
396 
-                mail_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
397 
-                echo "  <li><a href=${mail_url}>${peer}</a></li>" >> $MAIL_FILE.new
398 
-                state=0
399 
-            fi
400 
-        fi
401 
-        if [ ${state} -eq "2" ]; then
402 
-            if [[ $line == *"address ="* ]]; then
403 
-                address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
404 
-                state=3
405 
-            fi
406 
-        fi
407 
-        if [ ${state} -eq "1" ]; then
408 
-            if [[ $line == *"hostname ="* ]]; then
409 
-                peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
410 
-                state=2
411 
-            fi
412 
-        fi
413 
-        if [[ $line == *"${ZERONET_MAIL_STR}"* && $line == "= "* ]]; then
414 
-            state=1
415 
-        fi
416 
-    done < "$TEMPFILE"
417 
-    echo '</ol>' >> $MAIL_FILE.new
418 
-}
419 
-
420 
-function zeronet_detect_fora {
421 
-    if [ -f $FORUM_FILE.new ]; then
422 
-        rm -f $FORUM_FILE.new
423 
-    fi
424 
-
425 
-    cat $TEMPFILE_BASE | grep "${ZERONET_FORUM_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
426 
-
427 
-    state=0
428 
-    address=""
429 
-    peer=""
430 
-    echo '<ol type="square">' >> $FORUM_FILE.new
431 
-    while IFS='' read -r line || [[ -n "$line" ]]; do
432 
-        if [ ${state} -eq "3" ]; then
433 
-            if [[ $line == *"txt ="* ]]; then
434 
-                forum_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
435 
-                echo "  <li><a href=${forum_url}>${peer}</a></li>" >> $FORUM_FILE.new
436 
-                state=0
437 
-            fi
438 
-        fi
439 
-        if [ ${state} -eq "2" ]; then
440 
-            if [[ $line == *"address ="* ]]; then
441 
-                address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
442 
-                state=3
443 
-            fi
444 
-        fi
445 
-        if [ ${state} -eq "1" ]; then
446 
-            if [[ $line == *"hostname ="* ]]; then
447 
-                peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
448 
-                state=2
449 
-            fi
450 
-        fi
451 
-        if [[ $line == *"${ZERONET_FORUM_STR}"* && $line == "= "* ]]; then
452 
-            state=1
453 
-        fi
454 
-    done < "$TEMPFILE"
455 
-    echo '<ol>' >> $FORUM_FILE.new
456 
-}
457 
-
458 
-function zeronet_detect_id {
459 
-    if [ -f $ID_FILE.new ]; then
460 
-        rm -f $ID_FILE.new
461 
-    fi
462 
-
463 
-    cat $TEMPFILE_BASE | grep "${ZERONET_ID_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
464 
-
465 
-    state=0
466 
-    address=""
467 
-    peer=""
468 
-    echo '<ol type="square">' >> $ID_FILE.new
469 
-    while IFS='' read -r line || [[ -n "$line" ]]; do
470 
-        if [ ${state} -eq "3" ]; then
471 
-            if [[ $line == *"txt ="* ]]; then
472 
-                id_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
473 
-                echo "  <li><a href=${id_url}>${peer}</a></li>" >> $ID_FILE.new
474 
-                state=0
475 
-            fi
476 
-        fi
477 
-        if [ ${state} -eq "2" ]; then
478 
-            if [[ $line == *"address ="* ]]; then
479 
-                address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
480 
-                state=3
481 
-            fi
482 
-        fi
483 
-        if [ ${state} -eq "1" ]; then
484 
-            if [[ $line == *"hostname ="* ]]; then
485 
-                peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
486 
-                state=2
487 
-            fi
488 
-        fi
489 
-        if [[ $line == *"${ZERONET_ID_STR}"* && $line == "= "* ]]; then
490 
-            state=1
491 
-        fi
492 
-    done < "$TEMPFILE"
493 
-    echo '</ol>' >> $ID_FILE.new
494 
-}
495 
-
496 190 
 function avahi_remove_info {
497 191 
     rm -f $TEMPFILE_BASE
498 192 
     rm -f $TEMPFILE
499 193 
 }
500 194
501 
-function zeronet_update_config {
502 
-    if [ ${tracker_ctr} -gt "0" ]; then
503 
-        cp -f $ZERONET_CONFIG.new $ZERONET_CONFIG
504 
-    else
505 
-        if [ -f $ZERONET_CONFIG ]; then
506 
-            rm -f $ZERONET_CONFIG
507 
-        fi
508 
-    fi
509 
-    rm -f $ZERONET_CONFIG.new
510 
-    if [ -d $ZERONET_INSTALL ]; then
511 
-        sudo chown zeronet:zeronet $ZERONET_CONFIG
512 
-    fi
513 
-}
514 
-
515 195 
 if [ ! -d /etc/avahi ]; then
516 196 
     exit 0
517 197 
 fi
518 198
519 199 
 avahi_extract_info
520 
-if [ $ENABLE_ZERONET ]; then
521 
-    zeronet_detect
522 
-    zeronet_detect_id
523 
-    zeronet_detect_blog
524 
-    zeronet_detect_mail
525 
-    zeronet_detect_fora
526 
-    zeronet_update_config
527 
-fi
528 
-
529 200 
 ipfs_bootstrap
530 201 
 ipfs_publish
531 
-#detect_tox_users
202 
+detect_tox_users
532 203 
 avahi_remove_info
533 204
534 
-# make some html headers and footers
535 
-if [ $ENABLE_ZERONET ]; then
536 
-    create_header $ID_FILE $ID_STR
537 
-    create_header $BLOGS_FILE $BLOGS_STR
538 
-    create_header $MAIL_FILE $MAIL_STR
539 
-    create_header $FORUM_FILE $FORA_STR
540 
-    create_footer $ID_FILE
541 
-    create_footer $BLOGS_FILE
542 
-    create_footer $MAIL_FILE
543 
-    create_footer $FORUM_FILE
544 
-
545 
-    # make the index page
546 
-    create_index
547 
-
548 
-    assemble_web_page ${ID_FILE} $ZERONET_INSTALL
549 
-    assemble_web_page ${BLOGS_FILE} $ZERONET_INSTALL
550 
-    assemble_web_page ${MAIL_FILE} $ZERONET_INSTALL
551 
-    assemble_web_page ${FORUM_FILE} $ZERONET_INSTALL
552 
-    chown -R zeronet:zeronet $ZERONET_INSTALL
553 
-fi
554 
-
555 
-#create_header $TOX_USERS_FILE $"Tox Users"
556 
-#create_footer $TOX_USERS_FILE
557 
-#assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL
558 
-
559 205 
 exit 0