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

Obtain zeronet variables from the main install file

This commit is contained in:
Bob Mottram 2016-04-12 09:45:46 +01:00
parent e8702fed67
commit 35c76bb980
2 changed files with 120 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/freedombone
View File

@ -484,7 +484,6 @@ TOX_NODES=
TOXIC_REPO="https://github.com/Tox/toxic"
TOXIC_COMMIT='4e0e322e32b0d7b5d1692f72876ac7f9ae2e610a'
#ZERONET_REPO='https://github.com/HelloZeroNet/ZeroNet.git'
ZERONET_REPO="https://github.com/HelloZeroNet/ZeroNet.git"
ZERONET_COMMIT='675bd462556c541d65e2d95f91f899146a373aad'
ZERONET_BLOG_REPO="https://github.com/HelloZeroNet/ZeroBlog"

33
src/freedombone-mesh-install
View File

@ -67,8 +67,10 @@ TOX_NODES=
# '192.254.75.102,2607:5600:284::2,33445,951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F,Tox RELENG,US'
# '144.76.60.215,2a01:4f8:191:64d6::1,33445,04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F,sonOfRa,DE'
#)
ZERONET_REPO="https://github.com/HelloZeroNet/ZeroNet.git"
ZERONET_COMMIT='675bd462556c541d65e2d95f91f899146a373aad'
# To avoid confusions these are obtained from the main project file
ZERONET_REPO=
ZERONET_COMMIT=
function show_help {
echo ''
@ -587,6 +589,33 @@ function mesh_tox_client {
}
function mesh_zeronet {
# obtain commits from the main file
if [ -f /usr/loca/bin/${PROJECT_NAME} ]; then
ZERONET_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
else
ZERONET_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
fi
if [ ${#ZERONET_COMMIT_MAIN} -gt 10 ]; then
ZERONET_COMMIT=$ZERONET_COMMIT_MAIN
fi
if [ ! $ZERONET_COMMIT ]; then
echo $'No Tox commit was specified'
exit 37046
fi
if [ -f /usr/loca/bin/${PROJECT_NAME} ]; then
ZERONET_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_REPO=" | head -n 1 | awk -F "'" '{print $2}')
else
ZERONET_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_REPO=" | head -n 1 | awk -F "'" '{print $2}')
fi
if [ ${#ZERONET_REPO_MAIN} -gt 5 ]; then
ZERONET_REPO=$ZERONET_REPO_MAIN
fi
if [ ! $ZERONET_REPO ]; then
echo $'No Tox commit was specified'
exit 37046
fi
$CHROOT_PREFIX apt-get -y install python python-msgpack python-gevent
$CHROOT_PREFIX apt-get -y install python-pip bittornado
$CHROOT_PREFIX pip install msgpack-python --upgrade