diff --git a/src/zeronetavahi b/src/zeronetavahi index 5223368f..61dcbf84 100755 --- a/src/zeronetavahi +++ b/src/zeronetavahi @@ -47,7 +47,6 @@ fi BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs FORUM_FILE=$ZERONET_INSTALL/freedombone-fora -IPFS_FILE=$ZERONET_INSTALL/freedombone-ipfs TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users ZERONET_INDEX=/home/$MY_USERNAME/mesh.html ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap @@ -73,6 +72,7 @@ function create_index { echo '
    ' >> $ZERONET_INDEX echo "
  1. My Blog
  2. " >> $ZERONET_INDEX echo "
  3. My Forum
  4. " >> $ZERONET_INDEX + echo "
  5. File Share
  6. " >> $ZERONET_INDEX echo '
' >> $ZERONET_INDEX echo '' >> $ZERONET_INDEX echo "

On the Mesh

" >> $ZERONET_INDEX @@ -81,7 +81,6 @@ function create_index { echo "
  • Blogs
  • " >> $ZERONET_INDEX echo "
  • Fora
  • " >> $ZERONET_INDEX echo "
  • Tox Users
  • " >> $ZERONET_INDEX - echo "
  • File shares
  • " >> $ZERONET_INDEX echo '' >> $ZERONET_INDEX echo '' >> $ZERONET_INDEX echo '' >> $ZERONET_INDEX @@ -228,23 +227,17 @@ done < "$TEMPFILE" echo '
      ' >> $FORUM_FILE.new -# detect IPFS file shares in the mesh -if [ -f $IPFS_FILE.new ]; then - rm -f $IPFS_FILE.new -fi - +# IPFS bootstrap cat $TEMPFILE_BASE | grep "IPFS\|hostname =\|address =\|port =\|txt =" > $TEMPFILE state=0 address="" peer="" -echo '
        ' >> $IPFS_FILE.new while IFS='' read -r line || [[ -n "$line" ]]; do if [ ${state} -eq "3" ]; then if [[ $line == *"txt ="* ]]; then ipfs_peer_id=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}' | awk -F '"' '{print $2}') ipfs bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id} - echo "
      1. ${peer}
      2. " >> $IPFS_FILE.new state=0 fi fi @@ -264,7 +257,6 @@ while IFS='' read -r line || [[ -n "$line" ]]; do state=1 fi done < "$TEMPFILE" -echo '
          ' >> $FORUM_FILE.new # detect Tox users @@ -302,10 +294,8 @@ fi create_header $BLOGS_FILE "Blogs" create_header $FORUM_FILE "Fora" create_header $TOX_USERS_FILE "Tox Users" -create_header $IPFS_FILE "File Shares" create_footer $BLOGS_FILE create_footer $FORUM_FILE -create_footer $IPFS_FILE create_footer $TOX_USERS_FILE # make the index page @@ -332,11 +322,4 @@ if [ -d $ZERONET_USER_HOME ]; then sudo chown zeronet:zeronet $TOX_USERS_FILE fi -# create a web page showing the file shares -cat ${IPFS_FILE}-header.html ${IPFS_FILE}.new ${IPFS_FILE}-footer.html > ${IPFS_FILE}.html -rm -f ${IPFS_FILE}.new -if [ -d $ZERONET_USER_HOME ]; then - sudo chown zeronet:zeronet $IPFS_FILE -fi - exit 0