|
@@ -29,7 +29,6 @@
|
29
|
29
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
30
|
30
|
|
31
|
31
|
PROJECT_NAME='freedombone'
|
32
|
|
-INSTALL_DIR=/root/build
|
33
|
32
|
COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
|
34
|
33
|
|
35
|
34
|
export TEXTDOMAIN=${PROJECT_NAME}-mesh-install
|
|
@@ -57,7 +56,9 @@ FRIENDS_MIRRORS_SERVER=
|
57
|
56
|
TOXID_REPO=
|
58
|
57
|
TOX_PORT=
|
59
|
58
|
TOX_REPO=
|
|
59
|
+TOXIC_REPO=
|
60
|
60
|
TOX_COMMIT=
|
|
61
|
+TOXIC_COMMIT=
|
61
|
62
|
# These are some default nodes, but you can replace them with trusted nodes
|
62
|
63
|
# as you prefer. See https://wiki.tox.im/Nodes
|
63
|
64
|
TOX_NODES=
|
|
@@ -578,15 +579,24 @@ function mesh_tox_client {
|
578
|
579
|
fi
|
579
|
580
|
|
580
|
581
|
# obtain commits from the main file
|
581
|
|
- if [ -f /usr/local/bin/freedombone ]; then
|
582
|
|
- TOXIC_COMMIT_MAIN=$(cat /usr/local/bin/freedombone | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
|
|
582
|
+ if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
|
|
583
|
+ TOXIC_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
|
583
|
584
|
else
|
584
|
|
- TOXIC_COMMIT_MAIN=$(cat /usr/bin/freedombone | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
|
|
585
|
+ TOXIC_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
|
585
|
586
|
fi
|
586
|
587
|
if [ ${#TOXIC_COMMIT_MAIN} -gt 10 ]; then
|
587
|
588
|
TOXIC_COMMIT=$TOXIC_COMMIT_MAIN
|
588
|
589
|
fi
|
589
|
590
|
|
|
591
|
+ if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
|
|
592
|
+ TOXIC_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')
|
|
593
|
+ else
|
|
594
|
+ TOXIC_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')
|
|
595
|
+ fi
|
|
596
|
+ if [ ${#TOXIC_REPO_MAIN} -gt 5 ]; then
|
|
597
|
+ TOXIC_REPO=$TOXIC_REPO_MAIN
|
|
598
|
+ fi
|
|
599
|
+
|
590
|
600
|
$CHROOT_PREFIX apt-get -y install libncursesw5-dev libconfig-dev libqrencode-dev
|
591
|
601
|
$CHROOT_PREFIX apt-get -y install libcurl4-openssl-dev libvpx-dev libopenal-dev
|
592
|
602
|
|