Browse Source

Only list ipfs users who have a tox id

Bob Mottram 8 years ago
parent
commit
614906ad05
No account linked to committer's email
2 changed files with 5 additions and 2 deletions
  1. 2
    1
      src/freedombone-image-mesh
  2. 3
    1
      src/zeronetavahi

+ 2
- 1
src/freedombone-image-mesh View File

799
     fi
799
     fi
800
 
800
 
801
     # make a public directory
801
     # make a public directory
802
+    TOX_ID='none'
802
     if [ -d /home/$MY_USERNAME/Desktop ]; then
803
     if [ -d /home/$MY_USERNAME/Desktop ]; then
803
         if [ ! -d /home/$MY_USERNAME/Public ]; then
804
         if [ ! -d /home/$MY_USERNAME/Public ]; then
804
             mkdir /home/$MY_USERNAME/Public
805
             mkdir /home/$MY_USERNAME/Public
811
                 exit 368225
812
                 exit 368225
812
             fi
813
             fi
813
         fi
814
         fi
815
+        TOX_ID=$(su -c 'toxid' - $MY_USERNAME)
814
     fi
816
     fi
815
 
817
 
816
-    TOX_ID=$(su -c 'toxid' - $MY_USERNAME)
817
     create_avahi_mesh_service "ipfs" "ipfs" "udp" "$IPFS_PORT" "${IPFS_PEER_ID}:${TOX_ID}"
818
     create_avahi_mesh_service "ipfs" "ipfs" "udp" "$IPFS_PORT" "${IPFS_PEER_ID}:${TOX_ID}"
818
 
819
 
819
     echo "IPFS installed with ID ${IPFS_PEER_ID}" >> $INSTALL_LOG
820
     echo "IPFS installed with ID ${IPFS_PEER_ID}" >> $INSTALL_LOG

+ 3
- 1
src/zeronetavahi View File

132
                 ipfs_tox_id=$(echo "$ipfs_txt" | awk -F ':' '{print $2}')
132
                 ipfs_tox_id=$(echo "$ipfs_txt" | awk -F ':' '{print $2}')
133
                 $IPFS_COMMAND bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id}
133
                 $IPFS_COMMAND bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id}
134
                 if [ -d /home/$MY_USERNAME/Desktop ]; then
134
                 if [ -d /home/$MY_USERNAME/Desktop ]; then
135
-                    echo "$ipfs_tox_id:$ipfs_peer_id" >> ${IPFS_USERS_FILE}.new
135
+                    if [[ $ipfs_tox_id != 'none' ]]; then
136
+                        echo "$ipfs_tox_id:$ipfs_peer_id" >> ${IPFS_USERS_FILE}.new
137
+                    fi
136
                 fi
138
                 fi
137
                 state=0
139
                 state=0
138
             fi
140
             fi