free
/
freedombone
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

More script replacements

Bob Mottram 8 年之前
父節點
cc61a80f97
當前提交
998274090f
共有 2 個文件被更改，包括 48 次插入 和 48 次删除
分割檢視 顯示文件統計
  1. 24
    24
      src/freedombone-image-customise
  2. 24
    24
      src/freedombone-mesh-install

+ 24
- 24
src/freedombone-image-customise 查看文件 

@@ -859,9 +859,9 @@ function mesh_tox_client {
859 859 
 	cp $TEMP_SCRIPT $rootdir/root/
860 860
861 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 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 865 
 	fi
866 866
867 867 
 	SECONDS=0
 
@@ -885,9 +885,9 @@ function mesh_tox_client {
885 885 
 function mesh_zeronet {
886 886 
 	# obtain commits from the main file
887 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 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 891 
 	fi
892 892 
 	if [ ${#ZERONET_COMMIT_MAIN} -gt 10 ]; then
893 893 
 		ZERONET_COMMIT=$ZERONET_COMMIT_MAIN
 
@@ -898,9 +898,9 @@ function mesh_zeronet {
898 898 
 	fi
899 899
900 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 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 904 
 	fi
905 905 
 	if [ ${#ZERONET_REPO_MAIN} -gt 5 ]; then
906 906 
 		ZERONET_REPO=$ZERONET_REPO_MAIN
 
@@ -911,9 +911,9 @@ function mesh_zeronet {
911 911 
 	fi
912 912
913 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 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 917 
 	fi
918 918 
 	if [ ${#ZERONET_PORT_MAIN} -gt 1 ]; then
919 919 
 		ZERONET_PORT=$ZERONET_PORT_MAIN
 
@@ -996,11 +996,11 @@ function mesh_zeronet {
996 996
997 997 
 function mesh_zeronet_blog {
998 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 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 1004 
 	fi
1005 1005
1006 1006 
 	git clone $ZERONET_BLOG_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroBlog
 
@@ -1015,11 +1015,11 @@ function mesh_zeronet_blog {
1015 1015
1016 1016 
 function mesh_zeronet_mail {
1017 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 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 1023 
 	fi
1024 1024
1025 1025 
 	git clone $ZERONET_MAIL_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroMail
 
@@ -1034,11 +1034,11 @@ function mesh_zeronet_mail {
1034 1034
1035 1035 
 function mesh_zeronet_forum {
1036 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 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 1042 
 	fi
1043 1043
1044 1044 
 	git clone $ZERONET_FORUM_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroTalk
 
@@ -1053,11 +1053,11 @@ function mesh_zeronet_forum {
1053 1053
1054 1054 
 function mesh_zeronet_id {
1055 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 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 1061 
 	fi
1062 1062
1063 1063 
 	git clone $ZERONET_ID_REPO $rootdir$MESH_INSTALL_DIR/zeronet/ZeroID

+ 24
- 24
src/freedombone-mesh-install 查看文件 

@@ -221,9 +221,9 @@ function mesh_avahi {
221 221 
 function mesh_babel_client {
222 222 
 	# TODO to be fixed
223 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 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 227 
 	fi
228 228
229 229 
 	if [ ! -f ${rootdir}/tmp/meshtype ]; then
 
@@ -421,9 +421,9 @@ function mesh_firewall {
421 421 
 function mesh_tox_node {
422 422 
 	# obtain commits from the main file
423 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 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 427 
 	fi
428 428 
 	if [ ${#TOXCORE_COMMIT_MAIN} -gt 10 ]; then
429 429 
 		TOXCORE_COMMIT=$TOXCORE_COMMIT_MAIN
 
@@ -434,9 +434,9 @@ function mesh_tox_node {
434 434 
 	fi
435 435
436 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 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 440 
 	fi
441 441 
 	if [ ${#TOXID_REPO_MAIN} -gt 5 ]; then
442 442 
 		TOXID_REPO=$TOXID_REPO_MAIN
 
@@ -447,9 +447,9 @@ function mesh_tox_node {
447 447 
 	fi
448 448
449 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 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 453 
 	fi
454 454 
 	if [ ${#TOX_PORT_MAIN} -gt 2 ]; then
455 455 
 		TOX_PORT=$TOX_PORT_MAIN
 
@@ -460,9 +460,9 @@ function mesh_tox_node {
460 460 
 	fi
461 461
462 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 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 466 
 	fi
467 467 
 	if [ ${#TOXCORE_REPO_MAIN} -gt 10 ]; then
468 468 
 		TOXCORE_REPO=$TOXCORE_REPO_MAIN
 
@@ -561,25 +561,25 @@ function mesh_tox_node {
561 561
562 562 
 function mesh_tox_client {
563 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 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 567 
 	fi
568 568
569 569 
 	# obtain commits from the main file
570 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 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 574 
 	fi
575 575 
 	if [ ${#TOXIC_COMMIT_MAIN} -gt 10 ]; then
576 576 
 		TOXIC_COMMIT=$TOXIC_COMMIT_MAIN
577 577 
 	fi
578 578
579 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 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 583 
 	fi
584 584 
 	if [ ${#TOXIC_REPO_MAIN} -gt 5 ]; then
585 585 
 		TOXIC_REPO=$TOXIC_REPO_MAIN
 
@@ -632,9 +632,9 @@ function mesh_tox_client_toxic_from_repo {
632 632 
 function mesh_zeronet {
633 633 
 	# obtain commits from the main file
634 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 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 638 
 	fi
639 639 
 	if [ ${#ZERONET_COMMIT_MAIN} -gt 10 ]; then
640 640 
 		ZERONET_COMMIT=$ZERONET_COMMIT_MAIN
 
@@ -645,9 +645,9 @@ function mesh_zeronet {
645 645 
 	fi
646 646
647 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 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 651 
 	fi
652 652 
 	if [ ${#ZERONET_REPO_MAIN} -gt 5 ]; then
653 653 
 		ZERONET_REPO=$ZERONET_REPO_MAIN
 
@@ -658,9 +658,9 @@ function mesh_zeronet {
658 658 
 	fi
659 659
660 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 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 664 
 	fi
665 665 
 	if [ ${#ZERONET_PORT_MAIN} -gt 1 ]; then
666 666 
 		ZERONET_PORT=$ZERONET_PORT_MAIN
 
@@ -744,9 +744,9 @@ function mesh_zeronet {
744 744
745 745 
 function mesh_batman_client {
746 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 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 750 
 	fi
751 751
752 752 
 	if [ ! -f ${rootdir}/tmp/meshtype ]; then