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

Install toxic client

This commit is contained in:
Bob Mottram 2015-08-26 20:49:27 +01:00
parent b089e11645
commit 48c9d23971
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/freedombone-client
View File

@ -105,6 +105,8 @@ function configure_ssh_client {
function mesh_babel {
sudo apt-get -y install babeld
sudo apt-get -y install irssi mumble
sudo apt-get -y install toxic
babel_script=/tmp/babel
@ -189,6 +191,8 @@ function mesh_batman {
sudo apt-get -y install iproute bridge-utils libnetfilter-conntrack3 batctl
sudo apt-get -y install python-dev libevent-dev ebtables python-pip
sudo apt-get -y install wireless-tools rfkill
sudo apt-get -y install irssi mumble
sudo apt-get -y install toxic
batman_script=/tmp/batman
@ -353,6 +357,15 @@ function mesh_batman {
echo ' else' >> $batman_script
echo ' service network-manager restart' >> $batman_script
echo ' fi' >> $batman_script
echo ' ' >> $batman_script
echo ' # restore tox bootstrap nodes for the internet' >> $batman_script
echo ' if [ -f /usr/share/toxic/DHTnodes.internet ]; then' >> $batman_script
echo ' mv /usr/share/toxic/DHTnodes.internet /usr/share/toxic/DHTnodes' >> $batman_script
echo ' fi' >> $batman_script
echo ' if [ -f /usr/local/share/toxic/DHTnodes.internet ]; then' >> $batman_script
echo ' mv /usr/local/share/toxic/DHTnodes.internet /usr/local/share/toxic/DHTnodes' >> $batman_script
echo ' fi' >> $batman_script
echo ' ' >> $batman_script
echo ' rm -f /tmp/meshtype' >> $batman_script
echo '}' >> $batman_script
echo '' >> $batman_script

14
src/freedombone-mesh
View File

@ -141,7 +141,12 @@ fi
if [ ! -f $MUMBLE_PATH ]; then
if [ ! -f $IRSSI_PATH ]; then
if [ -f $TOXIC_PATH ]; then
lstox -f dht > $DHTNODES
if [ -f $DHTNODES ]; then
if [ ! -f $DHTNODES.internet ]; then
sudo cp $DHTNODES $DHTNODES.internet
fi
fi
sudo lstox -f dht > $DHTNODES
PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
if [ ${#PEER_TOX_ID} -gt 30 ]; then
echo "/add $PEER_TOX_ID
@ -194,7 +199,12 @@ if [[ $peer_index == 1 ]]; then
else
if [[ $peer_index == 2 ]]; then
if [ -f $TOX_PATH ]; then
lstox -f dht > $DHTNODES
if [ -f $DHTNODES ]; then
if [ ! -f $DHTNODES.internet ]; then
sudo cp $DHTNODES $DHTNODES.internet
fi
fi
sudo lstox -f dht > $DHTNODES
PEER_TOX_ID=$(lstox -p $AVAHI_DOMAIN | head -n 1 | awk -F ' ' '{print $2}')
if [ ${#PEER_TOX_ID} -gt 30 ]; then
echo "/add $PEER_TOX_ID