|
@@ -487,9 +487,9 @@ BABEL_PORT=6696
|
487
|
487
|
ENABLE_SOCIAL_KEY_MANAGEMENT="no"
|
488
|
488
|
|
489
|
489
|
TOX_PORT=33445
|
490
|
|
-TOX_REPO="git://github.com/irungentoo/toxcore.git"
|
|
490
|
+TOXCORE_REPO="git://github.com/irungentoo/toxcore.git"
|
|
491
|
+TOXCORE_COMMIT='532629d486e3361c7d8d95b38293cc7d61dc4ee5'
|
491
|
492
|
TOXID_REPO="https://github.com/bashrc/toxid"
|
492
|
|
-TOX_COMMIT='532629d486e3361c7d8d95b38293cc7d61dc4ee5'
|
493
|
493
|
TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
|
494
|
494
|
# These are some default nodes, but you can replace them with trusted nodes
|
495
|
495
|
# as you prefer. See https://wiki.tox.im/Nodes
|
|
@@ -1213,8 +1213,8 @@ function read_configuration {
|
1213
|
1213
|
if grep -q "GOGS_COMMIT" $CONFIGURATION_FILE; then
|
1214
|
1214
|
GOGS_COMMIT=$(grep "GOGS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1215
|
1215
|
fi
|
1216
|
|
- if grep -q "TOX_COMMIT" $CONFIGURATION_FILE; then
|
1217
|
|
- TOX_COMMIT=$(grep "TOX_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1216
|
+ if grep -q "TOXCORE_COMMIT" $CONFIGURATION_FILE; then
|
|
1217
|
+ TOXCORE_COMMIT=$(grep "TOXCORE_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1218
|
1218
|
fi
|
1219
|
1219
|
if grep -q "TOXIC_COMMIT" $CONFIGURATION_FILE; then
|
1220
|
1220
|
TOXIC_COMMIT=$(grep "TOXIC_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
@@ -1297,8 +1297,8 @@ function read_configuration {
|
1297
|
1297
|
if grep -q "TOX_NODES" $CONFIGURATION_FILE; then
|
1298
|
1298
|
TOX_NODES=$(grep "TOX_NODES" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1299
|
1299
|
fi
|
1300
|
|
- if grep -q "TOX_REPO" $CONFIGURATION_FILE; then
|
1301
|
|
- TOX_REPO=$(grep "TOX_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1300
|
+ if grep -q "TOXCORE_REPO" $CONFIGURATION_FILE; then
|
|
1301
|
+ TOXCORE_REPO=$(grep "TOXCORE_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1302
|
1302
|
fi
|
1303
|
1303
|
if grep -q "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE; then
|
1304
|
1304
|
ENABLE_SOCIAL_KEY_MANAGEMENT=$(grep "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
@@ -3080,7 +3080,7 @@ function install_zeronet {
|
3080
|
3080
|
return
|
3081
|
3081
|
fi
|
3082
|
3082
|
|
3083
|
|
- ${PROJECT_NAME}=mesh-install zeronet
|
|
3083
|
+ ${PROJECT_NAME}-mesh-install zeronet
|
3084
|
3084
|
systemctl daemon-reload
|
3085
|
3085
|
systemctl start tracker.service
|
3086
|
3086
|
systemctl start zeronet.service
|
|
@@ -6858,7 +6858,7 @@ function install_tox_node {
|
6858
|
6858
|
fi
|
6859
|
6859
|
|
6860
|
6860
|
# update to the next commit
|
6861
|
|
- set_repo_commit $INSTALL_DIR/toxcore "toxcore commit" "$TOX_COMMIT" $TOX_REPO
|
|
6861
|
+ set_repo_commit $INSTALL_DIR/toxcore "toxcore commit" "$TOXCORE_COMMIT" $TOXCORE_REPO
|
6862
|
6862
|
|
6863
|
6863
|
if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
|
6864
|
6864
|
return
|