Only install toxic on mesh clients

This commit is contained in:
Bob Mottram 2016-05-28 21:04:27 +01:00
parent 19a749c128
commit 2aea610b44
2 changed files with 896 additions and 885 deletions

View File

@ -191,9 +191,7 @@ configure_ssh_client
configure_monkeysphere
if [[ $MESH_CLIENT_INSTALL == $'yes' || $MESH_CLIENT_INSTALL == $'y' || $MESH_CLIENT_INSTALL == $'on' ]]; then
echo $'Installing mesh packages'
sudo ${PROJECT_NAME}-mesh-install -f mesh_tox_node
sudo ${PROJECT_NAME}-mesh-install -f mesh_tox_client
${PROJECT_NAME}-mesh-install -f qtox
${PROJECT_NAME}-mesh-install -f toxic
${PROJECT_NAME}-mesh-install -f batman_client
fi
echo $'Configuration complete'

View File

@ -621,16 +621,26 @@ function mesh_tox_client {
fi
}
function mesh_tox_client_qtox {
function enable_tox_repo {
sudo sh -c 'echo "deb https://pkg.tox.chat/debian/ nightly release" > /etc/apt/sources.list.d/tox.list'
wget -qO - https://pkg.tox.chat/debian/pkg.gpg.key | sudo apt-key add -
sudo apt-get -y install apt-transport-https
sudo apt-get -y update -qq
echo "qTox Repository Installed."
echo "Tox Repository Installed."
}
function mesh_tox_client_qtox {
enable_tox_repo
sudo apt-get -y install qtox
echo "qTox Installed."
}
function mesh_tox_client_toxic_from_repo {
enable_tox_repo
sudo apt-get -y install toxic
echo "Toxic Installed."
}
function mesh_zeronet {
# obtain commits from the main file
if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
@ -1073,5 +1083,8 @@ fi
if [[ $FN == 'qtox' ]]; then
mesh_tox_client_qtox
fi
if [[ $FN == 'toxic' ]]; then
mesh_tox_client_toxic_from_repo
fi
exit 0