From c318a3e9109a67fe34aee2a5db6fd50843406086 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 11 Sep 2016 13:30:09 +0100 Subject: [PATCH] Tidying --- src/zeronetavahi | 358 +---------------------------------------------- 1 file changed, 2 insertions(+), 356 deletions(-) diff --git a/src/zeronetavahi b/src/zeronetavahi index 5d2bb9b4..3ad69753 100755 --- a/src/zeronetavahi +++ b/src/zeronetavahi @@ -36,48 +36,15 @@ PROJECT_NAME='freedombone' export TEXTDOMAIN=$PROJECT_NAME-zeronetavahi export TEXTDOMAINDIR="/usr/share/locale" -MESH_INSTALL_DIR=/var/lib -WEB_PAGE_TITLE=$"${PROJECT_NAME} Mesh" -TRACKER_PORT=6969 -ZERONET_INSTALL=$MESH_INSTALL_DIR/zeronet MESH_USERNAME='fbone' MY_USERNAME=$MESH_USERNAME -BLOGS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-blogs -MAIL_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-mail -FORUM_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-fora -TOX_USERS_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-tox-users -ID_FILE=$ZERONET_INSTALL/${PROJECT_NAME}-id -ZERONET_INDEX=$ZERONET_INSTALL/mesh.html -ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap - IPFS_PORT=4001 IPFS_PATH=/usr/bin IPFS_COMMAND=$IPFS_PATH/ipfs IPFS_USERS_FILE=/home/$MY_USERNAME/.ipfs-users IPFS_PUBLIC=/home/$MY_USERNAME/.ipfs-public -MY_BLOG_STR=$"My Blog" -MY_MAIL_STR=$"My Mail" -MY_FORUM_STR=$"My Forum" -MY_ID_STR=$"My ID Service" -YOUR_SITES_STR=$'Your Sites' -ON_THE_MESH_STR=$'On the Mesh' - -BLOGS_STR=$"Blogs" -MAIL_STR=$"Mail" -FORA_STR=$"Fora" -TOX_STR=$"Users on the Mesh" -ID_STR=$"ID Services" -NO_USERS_STR=$"No users found" - -# service names advertised by avahi -ENABLE_ZERONET= -ZERONET_BLOG_STR="ZeroNet Blog" -ZERONET_MAIL_STR="ZeroNet Mail" -ZERONET_FORUM_STR="ZeroNet Forum" -ZERONET_ID_STR="ZeroNet ID Service" - # contains the output of the avahi command TEMPFILE_BASE=$(mktemp /tmp/zeronetavahibase.XXXXXX) TEMPFILE=$(mktemp /tmp/zeronetavahi.XXXXXX) @@ -183,7 +150,7 @@ function detect_new_tox_users { # Produce notifications if new users appear if [ -f $PREV_TOX_USERS_FILE ]; then while IFS='' read -r line || [[ -n "$line" ]]; do - if [[ $line != "Failed*" && $line != "data "* ]]; then + if [[ $line != "Failed*" && $line != "data "* && $line != "Anon "* && $line != "anon "* ]]; then if ! grep -q "$line" $PREV_TOX_USERS_FILE; then # get the nick of the user toxuser="$(echo "$line" | awk -F ' ' '{print $1}')" @@ -209,97 +176,6 @@ function detect_tox_users { lstox | awk -F ' ' '{$1=""; print $0}' | sed -e 's/^[[:space:]]*//' | sort -d > $TEMPFILE detect_new_tox_users $TEMPFILE - - toxctr=0 - echo '
    ' >> $TOX_USERS_FILE.new - while IFS='' read -r line || [[ -n "$line" ]]; do - if [[ $line != "Failed*" && $line != "data "* ]]; then - echo "
  1. $line
    2. " >> $TOX_USERS_FILE.new - toxctr=$((toxctr + 1)) - fi - done < "$TEMPFILE" - if [ $toxctr -eq "0" ]; then - echo "
  2. ${NO_USERS_STR}
    3. " >> $TOX_USERS_FILE.new - fi - echo '
      ' >> $TOX_USERS_FILE.new -} - -function assemble_web_page { - f="$1" - fhome="$2" - cat "${f}-header.html" "${f}.new" "${f}-footer.html" > "${f}.html" - rm -f "${f}.new" - if [ -d "${fhome}" ]; then - sudo chown zeronet:zeronet "${f}.html" - fi -} - -function create_index { - blogaddress=$(cat /home/$MY_USERNAME/.config/zeronet/myblog) - mailaddress=$(cat /home/$MY_USERNAME/.config/zeronet/mymail) - forumaddress=$(cat /home/$MY_USERNAME/.config/zeronet/myforum) - idaddress=$(cat /home/$MY_USERNAME/.config/zeronet/myzeroid) - if [ -f $ZERONET_INDEX ]; then - sed -i "s|.*${MY_BLOG_STR}.*|
    1. ${MY_BLOG_STR}
      2. |g" $ZERONET_INDEX - sed -i "s|.*${MY_MAIL_STR}.*|
    2. ${MY_MAIL_STR}
      3. |g" $ZERONET_INDEX - sed -i "s|.*${MY_FORUM_STR}.*|
    3. ${MY_FORUM_STR}
      4. |g" $ZERONET_INDEX - sed -i "s|.*${MY_ID_STR}.*|
    4. ${MY_ID_STR}
      5. |g" $ZERONET_INDEX - return - fi - echo '' > $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo "$WEB_PAGE_TITLE" >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo "

      $WEB_PAGE_TITLE

      " >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo "

      ${YOUR_SITES_STR}

      " >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo '
        ' >> $ZERONET_INDEX - echo "
      1. ${MY_BLOG_STR}
        2. " >> $ZERONET_INDEX - echo "
      2. ${MY_MAIL_STR}
        3. " >> $ZERONET_INDEX - echo "
      3. ${MY_FORUM_STR}
        4. " >> $ZERONET_INDEX - echo "
      4. ${MY_ID_STR}
        5. " >> $ZERONET_INDEX -# echo "
      5. File Share
        6. " >> $ZERONET_INDEX - echo '
      ' >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo "

      ${ON_THE_MESH_STR}

      " >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo '
        ' >> $ZERONET_INDEX - echo "
      1. ${BLOGS_STR}
        2. " >> $ZERONET_INDEX - echo "
      2. ${MAIL_STR}
        3. " >> $ZERONET_INDEX - echo "
      3. ${FORA_STR}
        4. " >> $ZERONET_INDEX - echo "
      4. ${ID_STR}
        5. " >> $ZERONET_INDEX - echo "
      5. ${TOX_STR}
        6. " >> $ZERONET_INDEX - echo '
      ' >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX - echo '' >> $ZERONET_INDEX -} - -function create_header { - header_file=${1}-header.html - if [ -f $header_file ]; then - return - fi - echo '' > $header_file - echo '' >> $header_file - echo '' >> $header_file - echo "$WEB_PAGE_TITLE - $2" >> $header_file - echo '' >> $header_file - echo '' >> $header_file - echo '' >> $header_file - echo "

      $2

      " >> $header_file -} - -function create_footer { - footer_file=${1}-footer.html - if [ -f $footer_file ]; then - return - fi - echo '' >> $footer_file - echo '' >> $footer_file } function avahi_extract_info { @@ -311,249 +187,19 @@ function avahi_extract_info { fi } -function zeronet_detect { - if [ -f $ZERONET_CONFIG.new ]; then - rm -f $ZERONET_CONFIG.new - fi - - touch $ZERONET_CONFIG.new - - state=0 - address="" - peer="" - tracker_ctr=0 - while IFS='' read -r line || [[ -n "$line" ]]; do - if [ ${state} -eq "1" ]; then - if [[ $line == *"address ="* ]]; then - address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - tracker_url="http://$peer:$TRACKER_PORT/announce" - if ! grep -q "$tracker_url" $ZERONET_CONFIG.new; then - echo "$tracker_url" >> $ZERONET_CONFIG.new - tracker_ctr=$((tracker_ctr + 1)) - fi - state=0 - fi - fi - if [[ $line == *"hostname ="* ]]; then - peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=1 - fi - done < "$TEMPFILE" -} - -function zeronet_detect_blog { - if [ -f $BLOGS_FILE.new ]; then - rm -f $BLOGS_FILE.new - fi - - cat $TEMPFILE_BASE | grep "${ZERONET_BLOG_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE - - state=0 - address="" - peer="" - echo '
        ' >> $BLOGS_FILE.new - while IFS='' read -r line || [[ -n "$line" ]]; do - if [ ${state} -eq "3" ]; then - if [[ $line == *"txt ="* ]]; then - blog_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - echo "
      1. ${peer}
        2. " >> $BLOGS_FILE.new - state=0 - fi - fi - if [ ${state} -eq "2" ]; then - if [[ $line == *"address ="* ]]; then - address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=3 - fi - fi - if [ ${state} -eq "1" ]; then - if [[ $line == *"hostname ="* ]]; then - peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=2 - fi - fi - if [[ $line == *"${ZERONET_BLOG_STR}"* && $line == "= "* ]]; then - state=1 - fi - done < "$TEMPFILE" - echo '
      ' >> $BLOGS_FILE.new -} - -function zeronet_detect_mail { - if [ -f $MAIL_FILE.new ]; then - rm -f $MAIL_FILE.new - fi - - cat $TEMPFILE_BASE | grep "${ZERONET_MAIL_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE - - state=0 - address="" - peer="" - echo '
        ' >> $MAIL_FILE.new - while IFS='' read -r line || [[ -n "$line" ]]; do - if [ ${state} -eq "3" ]; then - if [[ $line == *"txt ="* ]]; then - mail_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - echo "
      1. ${peer}
        2. " >> $MAIL_FILE.new - state=0 - fi - fi - if [ ${state} -eq "2" ]; then - if [[ $line == *"address ="* ]]; then - address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=3 - fi - fi - if [ ${state} -eq "1" ]; then - if [[ $line == *"hostname ="* ]]; then - peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=2 - fi - fi - if [[ $line == *"${ZERONET_MAIL_STR}"* && $line == "= "* ]]; then - state=1 - fi - done < "$TEMPFILE" - echo '
      ' >> $MAIL_FILE.new -} - -function zeronet_detect_fora { - if [ -f $FORUM_FILE.new ]; then - rm -f $FORUM_FILE.new - fi - - cat $TEMPFILE_BASE | grep "${ZERONET_FORUM_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE - - state=0 - address="" - peer="" - echo '
        ' >> $FORUM_FILE.new - while IFS='' read -r line || [[ -n "$line" ]]; do - if [ ${state} -eq "3" ]; then - if [[ $line == *"txt ="* ]]; then - forum_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - echo "
      1. ${peer}
        2. " >> $FORUM_FILE.new - state=0 - fi - fi - if [ ${state} -eq "2" ]; then - if [[ $line == *"address ="* ]]; then - address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=3 - fi - fi - if [ ${state} -eq "1" ]; then - if [[ $line == *"hostname ="* ]]; then - peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=2 - fi - fi - if [[ $line == *"${ZERONET_FORUM_STR}"* && $line == "= "* ]]; then - state=1 - fi - done < "$TEMPFILE" - echo '
          ' >> $FORUM_FILE.new -} - -function zeronet_detect_id { - if [ -f $ID_FILE.new ]; then - rm -f $ID_FILE.new - fi - - cat $TEMPFILE_BASE | grep "${ZERONET_ID_STR}\|hostname =\|address =\|port =\|txt =" > $TEMPFILE - - state=0 - address="" - peer="" - echo '
            ' >> $ID_FILE.new - while IFS='' read -r line || [[ -n "$line" ]]; do - if [ ${state} -eq "3" ]; then - if [[ $line == *"txt ="* ]]; then - id_url=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - echo "
          1. ${peer}
            2. " >> $ID_FILE.new - state=0 - fi - fi - if [ ${state} -eq "2" ]; then - if [[ $line == *"address ="* ]]; then - address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=3 - fi - fi - if [ ${state} -eq "1" ]; then - if [[ $line == *"hostname ="* ]]; then - peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}') - state=2 - fi - fi - if [[ $line == *"${ZERONET_ID_STR}"* && $line == "= "* ]]; then - state=1 - fi - done < "$TEMPFILE" - echo '
          ' >> $ID_FILE.new -} - function avahi_remove_info { rm -f $TEMPFILE_BASE rm -f $TEMPFILE } -function zeronet_update_config { - if [ ${tracker_ctr} -gt "0" ]; then - cp -f $ZERONET_CONFIG.new $ZERONET_CONFIG - else - if [ -f $ZERONET_CONFIG ]; then - rm -f $ZERONET_CONFIG - fi - fi - rm -f $ZERONET_CONFIG.new - if [ -d $ZERONET_INSTALL ]; then - sudo chown zeronet:zeronet $ZERONET_CONFIG - fi -} - if [ ! -d /etc/avahi ]; then exit 0 fi avahi_extract_info -if [ $ENABLE_ZERONET ]; then - zeronet_detect - zeronet_detect_id - zeronet_detect_blog - zeronet_detect_mail - zeronet_detect_fora - zeronet_update_config -fi - ipfs_bootstrap ipfs_publish -#detect_tox_users +detect_tox_users avahi_remove_info -# make some html headers and footers -if [ $ENABLE_ZERONET ]; then - create_header $ID_FILE $ID_STR - create_header $BLOGS_FILE $BLOGS_STR - create_header $MAIL_FILE $MAIL_STR - create_header $FORUM_FILE $FORA_STR - create_footer $ID_FILE - create_footer $BLOGS_FILE - create_footer $MAIL_FILE - create_footer $FORUM_FILE - - # make the index page - create_index - - assemble_web_page ${ID_FILE} $ZERONET_INSTALL - assemble_web_page ${BLOGS_FILE} $ZERONET_INSTALL - assemble_web_page ${MAIL_FILE} $ZERONET_INSTALL - assemble_web_page ${FORUM_FILE} $ZERONET_INSTALL - chown -R zeronet:zeronet $ZERONET_INSTALL -fi - -#create_header $TOX_USERS_FILE $"Tox Users" -#create_footer $TOX_USERS_FILE -#assemble_web_page ${TOX_USERS_FILE} $ZERONET_INSTALL - exit 0