This commit is contained in:
Bob Mottram 2016-05-28 09:57:19 +01:00
parent 07d7a1a45a
commit ee8d20ac9e
1 changed files with 881 additions and 881 deletions

View File

@ -55,9 +55,9 @@ FRIENDS_MIRRORS_SERVER=
# To avoid confusions these are obtained from the main project file # To avoid confusions these are obtained from the main project file
TOXID_REPO= TOXID_REPO=
TOX_PORT= TOX_PORT=
TOX_REPO= TOXCORE_REPO=
TOXIC_REPO= TOXIC_REPO=
TOX_COMMIT= TOXCORE_COMMIT=
TOXIC_COMMIT= TOXIC_COMMIT=
# These are some default nodes, but you can replace them with trusted nodes # These are some default nodes, but you can replace them with trusted nodes
# as you prefer. See https://wiki.tox.im/Nodes # as you prefer. See https://wiki.tox.im/Nodes
@ -432,14 +432,14 @@ function mesh_firewall {
function mesh_tox_node { function mesh_tox_node {
# obtain commits from the main file # obtain commits from the main file
if [ -f /usr/local/bin/${PROJECT_NAME} ]; then if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
TOX_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOX_COMMIT=" | head -n 1 | awk -F "'" '{print $2}') TOXCORE_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXCORE_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
else else
TOX_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOX_COMMIT=" | head -n 1 | awk -F "'" '{print $2}') TOXCORE_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXCORE_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
fi fi
if [ ${#TOX_COMMIT_MAIN} -gt 10 ]; then if [ ${#TOXCORE_COMMIT_MAIN} -gt 10 ]; then
TOX_COMMIT=$TOX_COMMIT_MAIN TOXCORE_COMMIT=$TOXCORE_COMMIT_MAIN
fi fi
if [ ! $TOX_COMMIT ]; then if [ ! $TOXCORE_COMMIT ]; then
echo $'No Tox commit was specified' echo $'No Tox commit was specified'
exit 76325 exit 76325
fi fi
@ -471,14 +471,14 @@ function mesh_tox_node {
fi fi
if [ -f /usr/local/bin/${PROJECT_NAME} ]; then if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
TOX_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOX_REPO=" | head -n 1 | awk -F '"' '{print $2}') TOXCORE_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
else else
TOX_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOX_REPO=" | head -n 1 | awk -F '"' '{print $2}') TOXCORE_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
fi fi
if [ ${#TOX_REPO_MAIN} -gt 10 ]; then if [ ${#TOXCORE_REPO_MAIN} -gt 10 ]; then
TOX_REPO=$TOX_REPO_MAIN TOXCORE_REPO=$TOXCORE_REPO_MAIN
fi fi
if [ ! $TOX_REPO ]; then if [ ! $TOXCORE_REPO ]; then
echo $'No Tox repo was specified' echo $'No Tox repo was specified'
exit 16865 exit 16865
fi fi
@ -488,9 +488,9 @@ function mesh_tox_node {
$CHROOT_PREFIX apt-get -y install libsodium13 libsodium-dev libcap2-bin $CHROOT_PREFIX apt-get -y install libsodium13 libsodium-dev libcap2-bin
$CHROOT_PREFIX apt-get -y install libconfig9 libconfig-dev $CHROOT_PREFIX apt-get -y install libconfig9 libconfig-dev
$CHROOT_PREFIX git_clone $TOX_REPO $INSTALL_DIR/toxcore $CHROOT_PREFIX git_clone $TOXCORE_REPO $INSTALL_DIR/toxcore
$CHROOT_PREFIX cd $INSTALL_DIR/toxcore $CHROOT_PREFIX cd $INSTALL_DIR/toxcore
$CHROOT_PREFIX git checkout $TOX_COMMIT -b $TOX_COMMIT $CHROOT_PREFIX git checkout $TOXCORE_COMMIT -b $TOXCORE_COMMIT
$CHROOT_PREFIX autoreconf -i $CHROOT_PREFIX autoreconf -i
$CHROOT_PREFIX ./configure --enable-daemon --disable-av $CHROOT_PREFIX ./configure --enable-daemon --disable-av