Browse Source

More script replacements

Bob Mottram 9 years ago
parent
commit
998274090f
2 changed files with 48 additions and 48 deletions
  1. 24
    24
      src/freedombone-image-customise
  2. 24
    24
      src/freedombone-mesh-install

+ 24
- 24
src/freedombone-image-customise View File

859
 	cp $TEMP_SCRIPT $rootdir/root/
859
 	cp $TEMP_SCRIPT $rootdir/root/
860
 
860
 
861
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
861
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
862
-		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
862
+		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
863
 	else
863
 	else
864
-		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
864
+		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
865
 	fi
865
 	fi
866
 
866
 
867
 	SECONDS=0
867
 	SECONDS=0
885
 function mesh_zeronet {
885
 function mesh_zeronet {
886
 	# obtain commits from the main file
886
 	# obtain commits from the main file
887
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
887
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
888
-		ZERONET_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
888
+		ZERONET_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
889
 	else
889
 	else
890
-		ZERONET_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
890
+		ZERONET_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
891
 	fi
891
 	fi
892
 	if [ ${#ZERONET_COMMIT_MAIN} -gt 10 ]; then
892
 	if [ ${#ZERONET_COMMIT_MAIN} -gt 10 ]; then
893
 		ZERONET_COMMIT=$ZERONET_COMMIT_MAIN
893
 		ZERONET_COMMIT=$ZERONET_COMMIT_MAIN
898
 	fi
898
 	fi
899
 
899
 
900
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
900
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
901
-		ZERONET_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
901
+		ZERONET_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
902
 	else
902
 	else
903
-		ZERONET_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
903
+		ZERONET_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
904
 	fi
904
 	fi
905
 	if [ ${#ZERONET_REPO_MAIN} -gt 5 ]; then
905
 	if [ ${#ZERONET_REPO_MAIN} -gt 5 ]; then
906
 		ZERONET_REPO=$ZERONET_REPO_MAIN
906
 		ZERONET_REPO=$ZERONET_REPO_MAIN
911
 	fi
911
 	fi
912
 
912
 
913
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
913
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
914
-		ZERONET_PORT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
914
+		ZERONET_PORT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
915
 	else
915
 	else
916
-		ZERONET_PORT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
916
+		ZERONET_PORT_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
917
 	fi
917
 	fi
918
 	if [ ${#ZERONET_PORT_MAIN} -gt 1 ]; then
918
 	if [ ${#ZERONET_PORT_MAIN} -gt 1 ]; then
919
 		ZERONET_PORT=$ZERONET_PORT_MAIN
919
 		ZERONET_PORT=$ZERONET_PORT_MAIN
996
 
996
 
997
 function mesh_zeronet_blog {
997
 function mesh_zeronet_blog {
998
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
998
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
999
-		ZERONET_BLOG_REPO=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_BLOG_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1000
-		ZERONET_BLOG_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_BLOG_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
999
+		ZERONET_BLOG_REPO=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_BLOG_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1000
+		ZERONET_BLOG_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_BLOG_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1001
 	else
1001
 	else
1002
-		ZERONET_BLOG_REPO=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_BLOG_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1003
-		ZERONET_BLOG_COMMIT=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_BLOG_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1002
+		ZERONET_BLOG_REPO=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_BLOG_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1003
+		ZERONET_BLOG_COMMIT=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_BLOG_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1004
 	fi
1004
 	fi
1005
 
1005
 
1006
 	git clone $ZERONET_BLOG_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroBlog
1006
 	git clone $ZERONET_BLOG_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroBlog
1015
 
1015
 
1016
 function mesh_zeronet_mail {
1016
 function mesh_zeronet_mail {
1017
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
1017
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
1018
-		ZERONET_MAIL_REPO=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_MAIL_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1019
-		ZERONET_MAIL_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_MAIL_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1018
+		ZERONET_MAIL_REPO=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_MAIL_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1019
+		ZERONET_MAIL_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_MAIL_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1020
 	else
1020
 	else
1021
-		ZERONET_MAIL_REPO=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_MAIL_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1022
-		ZERONET_MAIL_COMMIT=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_MAIL_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1021
+		ZERONET_MAIL_REPO=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_MAIL_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1022
+		ZERONET_MAIL_COMMIT=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_MAIL_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1023
 	fi
1023
 	fi
1024
 
1024
 
1025
 	git clone $ZERONET_MAIL_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroMail
1025
 	git clone $ZERONET_MAIL_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroMail
1034
 
1034
 
1035
 function mesh_zeronet_forum {
1035
 function mesh_zeronet_forum {
1036
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
1036
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
1037
-		ZERONET_FORUM_REPO=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_FORUM_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1038
-		ZERONET_FORUM_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_FORUM_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1037
+		ZERONET_FORUM_REPO=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_FORUM_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1038
+		ZERONET_FORUM_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_FORUM_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1039
 	else
1039
 	else
1040
-		ZERONET_FORUM_REPO=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_FORUM_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1041
-		ZERONET_FORUM_COMMIT=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_FORUM_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1040
+		ZERONET_FORUM_REPO=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_FORUM_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1041
+		ZERONET_FORUM_COMMIT=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_FORUM_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1042
 	fi
1042
 	fi
1043
 
1043
 
1044
 	git clone $ZERONET_FORUM_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroTalk
1044
 	git clone $ZERONET_FORUM_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroTalk
1053
 
1053
 
1054
 function mesh_zeronet_id {
1054
 function mesh_zeronet_id {
1055
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
1055
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
1056
-		ZERONET_ID_REPO=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_ID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1057
-		ZERONET_ID_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_ID_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1056
+		ZERONET_ID_REPO=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_ID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1057
+		ZERONET_ID_COMMIT=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_ID_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1058
 	else
1058
 	else
1059
-		ZERONET_ID_REPO=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_ID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1060
-		ZERONET_ID_COMMIT=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_ID_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1059
+		ZERONET_ID_REPO=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_ID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
1060
+		ZERONET_ID_COMMIT=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_ID_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
1061
 	fi
1061
 	fi
1062
 
1062
 
1063
 	git clone $ZERONET_ID_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroID
1063
 	git clone $ZERONET_ID_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroID

+ 24
- 24
src/freedombone-mesh-install View File

221
 function mesh_babel_client {
221
 function mesh_babel_client {
222
 	# TODO to be fixed
222
 	# TODO to be fixed
223
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
223
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
224
-		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
224
+		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
225
 	else
225
 	else
226
-		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
226
+		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
227
 	fi
227
 	fi
228
 
228
 
229
 	if [ ! -f ${rootdir}/tmp/meshtype ]; then
229
 	if [ ! -f ${rootdir}/tmp/meshtype ]; then
421
 function mesh_tox_node {
421
 function mesh_tox_node {
422
 	# obtain commits from the main file
422
 	# obtain commits from the main file
423
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
423
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
424
-		TOXCORE_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXCORE_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
424
+		TOXCORE_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXCORE_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
425
 	else
425
 	else
426
-		TOXCORE_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXCORE_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
426
+		TOXCORE_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXCORE_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
427
 	fi
427
 	fi
428
 	if [ ${#TOXCORE_COMMIT_MAIN} -gt 10 ]; then
428
 	if [ ${#TOXCORE_COMMIT_MAIN} -gt 10 ]; then
429
 		TOXCORE_COMMIT=$TOXCORE_COMMIT_MAIN
429
 		TOXCORE_COMMIT=$TOXCORE_COMMIT_MAIN
434
 	fi
434
 	fi
435
 
435
 
436
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
436
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
437
-		TOXID_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
437
+		TOXID_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
438
 	else
438
 	else
439
-		TOXID_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
439
+		TOXID_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXID_REPO=" | head -n 1 | awk -F '"' '{print $2}')
440
 	fi
440
 	fi
441
 	if [ ${#TOXID_REPO_MAIN} -gt 5 ]; then
441
 	if [ ${#TOXID_REPO_MAIN} -gt 5 ]; then
442
 		TOXID_REPO=$TOXID_REPO_MAIN
442
 		TOXID_REPO=$TOXID_REPO_MAIN
447
 	fi
447
 	fi
448
 
448
 
449
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
449
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
450
-		TOX_PORT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOX_PORT=" | head -n 1 | awk -F '=' '{print $2}')
450
+		TOX_PORT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOX_PORT=" | head -n 1 | awk -F '=' '{print $2}')
451
 	else
451
 	else
452
-		TOX_PORT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOX_PORT=" | head -n 1 | awk -F '=' '{print $2}')
452
+		TOX_PORT_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOX_PORT=" | head -n 1 | awk -F '=' '{print $2}')
453
 	fi
453
 	fi
454
 	if [ ${#TOX_PORT_MAIN} -gt 2 ]; then
454
 	if [ ${#TOX_PORT_MAIN} -gt 2 ]; then
455
 		TOX_PORT=$TOX_PORT_MAIN
455
 		TOX_PORT=$TOX_PORT_MAIN
460
 	fi
460
 	fi
461
 
461
 
462
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
462
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
463
-		TOXCORE_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
463
+		TOXCORE_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
464
 	else
464
 	else
465
-		TOXCORE_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
465
+		TOXCORE_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
466
 	fi
466
 	fi
467
 	if [ ${#TOXCORE_REPO_MAIN} -gt 10 ]; then
467
 	if [ ${#TOXCORE_REPO_MAIN} -gt 10 ]; then
468
 		TOXCORE_REPO=$TOXCORE_REPO_MAIN
468
 		TOXCORE_REPO=$TOXCORE_REPO_MAIN
561
 
561
 
562
 function mesh_tox_client {
562
 function mesh_tox_client {
563
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
563
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
564
-		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
564
+		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
565
 	else
565
 	else
566
-		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
566
+		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
567
 	fi
567
 	fi
568
 
568
 
569
 	# obtain commits from the main file
569
 	# obtain commits from the main file
570
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
570
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
571
-		TOXIC_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
571
+		TOXIC_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
572
 	else
572
 	else
573
-		TOXIC_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
573
+		TOXIC_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
574
 	fi
574
 	fi
575
 	if [ ${#TOXIC_COMMIT_MAIN} -gt 10 ]; then
575
 	if [ ${#TOXIC_COMMIT_MAIN} -gt 10 ]; then
576
 		TOXIC_COMMIT=$TOXIC_COMMIT_MAIN
576
 		TOXIC_COMMIT=$TOXIC_COMMIT_MAIN
577
 	fi
577
 	fi
578
 
578
 
579
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
579
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
580
-		TOXIC_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')
580
+		TOXIC_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')
581
 	else
581
 	else
582
-		TOXIC_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')
582
+		TOXIC_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_REPO=" | head -n 1 | awk -F '"' '{print $2}')
583
 	fi
583
 	fi
584
 	if [ ${#TOXIC_REPO_MAIN} -gt 5 ]; then
584
 	if [ ${#TOXIC_REPO_MAIN} -gt 5 ]; then
585
 		TOXIC_REPO=$TOXIC_REPO_MAIN
585
 		TOXIC_REPO=$TOXIC_REPO_MAIN
632
 function mesh_zeronet {
632
 function mesh_zeronet {
633
 	# obtain commits from the main file
633
 	# obtain commits from the main file
634
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
634
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
635
-		ZERONET_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
635
+		ZERONET_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
636
 	else
636
 	else
637
-		ZERONET_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
637
+		ZERONET_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
638
 	fi
638
 	fi
639
 	if [ ${#ZERONET_COMMIT_MAIN} -gt 10 ]; then
639
 	if [ ${#ZERONET_COMMIT_MAIN} -gt 10 ]; then
640
 		ZERONET_COMMIT=$ZERONET_COMMIT_MAIN
640
 		ZERONET_COMMIT=$ZERONET_COMMIT_MAIN
645
 	fi
645
 	fi
646
 
646
 
647
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
647
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
648
-		ZERONET_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
648
+		ZERONET_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
649
 	else
649
 	else
650
-		ZERONET_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
650
+		ZERONET_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_REPO=" | head -n 1 | awk -F '"' '{print $2}')
651
 	fi
651
 	fi
652
 	if [ ${#ZERONET_REPO_MAIN} -gt 5 ]; then
652
 	if [ ${#ZERONET_REPO_MAIN} -gt 5 ]; then
653
 		ZERONET_REPO=$ZERONET_REPO_MAIN
653
 		ZERONET_REPO=$ZERONET_REPO_MAIN
658
 	fi
658
 	fi
659
 
659
 
660
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
660
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
661
-		ZERONET_PORT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
661
+		ZERONET_PORT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
662
 	else
662
 	else
663
-		ZERONET_PORT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
663
+		ZERONET_PORT_MAIN=$(cat /usr/bin/${PROJECT_NAME}-app-zeronet | grep "ZERONET_PORT=" | head -n 1 | awk -F '=' '{print $2}')
664
 	fi
664
 	fi
665
 	if [ ${#ZERONET_PORT_MAIN} -gt 1 ]; then
665
 	if [ ${#ZERONET_PORT_MAIN} -gt 1 ]; then
666
 		ZERONET_PORT=$ZERONET_PORT_MAIN
666
 		ZERONET_PORT=$ZERONET_PORT_MAIN
744
 
744
 
745
 function mesh_batman_client {
745
 function mesh_batman_client {
746
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
746
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
747
-		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
747
+		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
748
 	else
748
 	else
749
-		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
749
+		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
750
 	fi
750
 	fi
751
 
751
 
752
 	if [ ! -f ${rootdir}/tmp/meshtype ]; then
752
 	if [ ! -f ${rootdir}/tmp/meshtype ]; then