free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only list ipfs users who have a tox id

This commit is contained in:
Bob Mottram 2016-09-07 22:30:12 +01:00
parent f09bb35ecf
commit 614906ad05
No known key found for this signature in database
GPG Key ID: 0452CC7CEA982E38
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedombone-image-mesh
View File

@ -799,6 +799,7 @@ function setup_ipfs {
fi fi
# make a public directory # make a public directory
TOX_ID='none'
if [ -d /home/$MY_USERNAME/Desktop ]; then if [ -d /home/$MY_USERNAME/Desktop ]; then
if [ ! -d /home/$MY_USERNAME/Public ]; then if [ ! -d /home/$MY_USERNAME/Public ]; then
mkdir /home/$MY_USERNAME/Public mkdir /home/$MY_USERNAME/Public
@ -811,9 +812,9 @@ function setup_ipfs {
exit 368225 exit 368225
fi fi
fi fi
TOX_ID=$(su -c 'toxid' - $MY_USERNAME)
fi fi
TOX_ID=$(su -c 'toxid' - $MY_USERNAME)
create_avahi_mesh_service "ipfs" "ipfs" "udp" "$IPFS_PORT" "${IPFS_PEER_ID}:${TOX_ID}" create_avahi_mesh_service "ipfs" "ipfs" "udp" "$IPFS_PORT" "${IPFS_PEER_ID}:${TOX_ID}"
echo "IPFS installed with ID ${IPFS_PEER_ID}" >> $INSTALL_LOG echo "IPFS installed with ID ${IPFS_PEER_ID}" >> $INSTALL_LOG

2
src/zeronetavahi
View File

@ -132,8 +132,10 @@ function ipfs_bootstrap {
ipfs_tox_id=$(echo "$ipfs_txt" | awk -F ':' '{print $2}') ipfs_tox_id=$(echo "$ipfs_txt" | awk -F ':' '{print $2}')
$IPFS_COMMAND bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id} $IPFS_COMMAND bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id}
if [ -d /home/$MY_USERNAME/Desktop ]; then if [ -d /home/$MY_USERNAME/Desktop ]; then
if [[ $ipfs_tox_id != 'none' ]]; then
echo "$ipfs_tox_id:$ipfs_peer_id" >> ${IPFS_USERS_FILE}.new echo "$ipfs_tox_id:$ipfs_peer_id" >> ${IPFS_USERS_FILE}.new
fi fi
fi
state=0 state=0
fi fi
fi fi