Bob Mottram hace 9 años
padre
commit
e8702fed67
Se han modificado 1 ficheros con 107 adiciones y 107 borrados
  1. 107
    107
      src/freedombone-mesh-install

+ 107
- 107
src/freedombone-mesh-install Ver fichero

@@ -420,10 +420,10 @@ function mesh_firewall {
420 420
 
421 421
 function mesh_tox_node {
422 422
     # obtain commits from the main file
423
-    if [ -f /usr/loca/bin/freedombone ]; then
424
-        TOX_COMMIT_MAIN=$(cat /usr/local/bin/freedombone | grep "TOX_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
423
+    if [ -f /usr/loca/bin/${PROJECT_NAME} ]; then
424
+        TOX_COMMIT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOX_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
425 425
     else
426
-        TOX_COMMIT_MAIN=$(cat /usr/bin/freedombone | grep "TOX_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')      
426
+        TOX_COMMIT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOX_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')      
427 427
     fi
428 428
     if [ ${#TOX_COMMIT_MAIN} -gt 10 ]; then
429 429
         TOX_COMMIT=$TOX_COMMIT_MAIN
@@ -433,10 +433,10 @@ function mesh_tox_node {
433 433
         exit 76325
434 434
     fi
435 435
     
436
-    if [ -f /usr/loca/bin/freedombone ]; then
437
-        TOXID_REPO_MAIN=$(cat /usr/local/bin/freedombone | grep "TOXID_REPO=" | head -n 1 | awk -F "'" '{print $2}')
436
+    if [ -f /usr/loca/bin/${PROJECT_NAME} ]; then
437
+        TOXID_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXID_REPO=" | head -n 1 | awk -F "'" '{print $2}')
438 438
     else
439
-        TOXID_REPO_MAIN=$(cat /usr/bin/freedombone | grep "TOXID_REPO=" | head -n 1 | awk -F "'" '{print $2}')      
439
+        TOXID_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | 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
@@ -446,10 +446,10 @@ function mesh_tox_node {
446 446
         exit 78252
447 447
     fi
448 448
 
449
-    if [ -f /usr/loca/bin/freedombone ]; then
450
-        TOX_PORT_MAIN=$(cat /usr/local/bin/freedombone | grep "TOX_PORT=" | head -n 1 | awk -F "'" '{print $2}')
449
+    if [ -f /usr/loca/bin/${PROJECT_NAME} ]; then
450
+        TOX_PORT_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOX_PORT=" | head -n 1 | awk -F "'" '{print $2}')
451 451
     else
452
-        TOX_PORT_MAIN=$(cat /usr/bin/freedombone | grep "TOX_PORT=" | head -n 1 | awk -F "'" '{print $2}')      
452
+        TOX_PORT_MAIN=$(cat /usr/bin/${PROJECT_NAME} | 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
@@ -459,105 +459,105 @@ function mesh_tox_node {
459 459
         exit 32856
460 460
     fi
461 461
 
462
-    if [ -f /usr/loca/bin/freedombone ]; then
463
-        TOX_REPO_MAIN=$(cat /usr/local/bin/freedombone | grep "TOX_REPO=" | head -n 1 | awk -F "'" '{print $2}')
464
-    else
465
-        TOX_REPO_MAIN=$(cat /usr/bin/freedombone | grep "TOX_REPO=" | head -n 1 | awk -F "'" '{print $2}')      
466
-    fi
467
-    if [ ${#TOX_REPO_MAIN} -gt 10 ]; then
468
-        TOX_REPO=$TOX_REPO_MAIN
469
-    fi 
470
-    if [ ! $TOX_REPO ]; then
471
-        echo $'No Tox repo was specified'
472
-        exit 16865
473
-    fi
462
+    if [ -f /usr/loca/bin/${PROJECT_NAME} ]; then
463
+		TOX_REPO_MAIN=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOX_REPO=" | head -n 1 | awk -F "'" '{print $2}')
464
+	else
465
+		TOX_REPO_MAIN=$(cat /usr/bin/${PROJECT_NAME} | grep "TOX_REPO=" | head -n 1 | awk -F "'" '{print $2}')      
466
+	fi
467
+	if [ ${#TOX_REPO_MAIN} -gt 10 ]; then
468
+		TOX_REPO=$TOX_REPO_MAIN
469
+	fi 
470
+	if [ ! $TOX_REPO ]; then
471
+		echo $'No Tox repo was specified'
472
+		exit 16865
473
+	fi
474 474
     
475
-    $CHROOT_PREFIX apt-get -y install build-essential libtool autotools-dev
476
-    $CHROOT_PREFIX apt-get -y install automake checkinstall check git yasm
477
-    $CHROOT_PREFIX apt-get -y install libsodium13 libsodium-dev libcap2-bin
478
-    $CHROOT_PREFIX apt-get -y install libconfig9 libconfig-dev
479
-
480
-    $CHROOT_PREFIX git_clone $TOX_REPO $INSTALL_DIR/toxcore
481
-    $CHROOT_PREFIX cd $INSTALL_DIR/toxcore
482
-    $CHROOT_PREFIX git checkout $TOX_COMMIT -b $TOX_COMMIT
483
-
484
-    $CHROOT_PREFIX autoreconf -i
485
-    $CHROOT_PREFIX ./configure --enable-daemon --disable-av
486
-    if [ ! "$?" = "0" ]; then
487
-        return
488
-    fi
489
-    $CHROOT_PREFIX make
490
-    if [ ! "$?" = "0" ]; then
491
-        return
492
-    fi
493
-    $CHROOT_PREFIX make install
494
-    $CHROOT_PREFIX cp /usr/local/lib/libtoxcore* /usr/lib/
495
-
496
-    if [ ! -f $rootdir/usr/local/bin/tox-bootstrapd ]; then
497
-        echo $"File not found /usr/local/bin/tox-bootstrapd"
498
-        return
499
-    fi
500
-
501
-    $CHROOT_PREFIX useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment $"Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
502
-    $CHROOT_PREFIX chmod 700 /var/lib/tox-bootstrapd
503
-    if [ ! -f $rootdir/$INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf ]; then
504
-        echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf"
505
-    fi
506
-    # remove Maildir
507
-    if [ -d $rootdir/var/lib/tox-bootstrapd/Maildir ]; then
508
-        rm -rf $rootdir/var/lib/tox-bootstrapd/Maildir
509
-    fi
510
-
511
-    # create configuration file
512
-    TOX_BOOTSTRAP_CONFIG=${rootdir}/etc/tox-bootstrapd.conf
513
-    echo "port = $TOX_PORT" > $TOX_BOOTSTRAP_CONFIG
514
-    echo 'keys_file_path = "/var/lib/tox-bootstrapd/keys"' >> $TOX_BOOTSTRAP_CONFIG
515
-    echo 'pid_file_path = "/var/run/tox-bootstrapd/tox-bootstrapd.pid"' >> $TOX_BOOTSTRAP_CONFIG
516
-    echo 'enable_ipv6 = true' >> $TOX_BOOTSTRAP_CONFIG
517
-    echo 'enable_ipv4_fallback = true' >> $TOX_BOOTSTRAP_CONFIG
518
-    echo 'enable_lan_discovery = true' >> $TOX_BOOTSTRAP_CONFIG
519
-    echo 'enable_tcp_relay = true' >> $TOX_BOOTSTRAP_CONFIG
520
-    echo "tcp_relay_ports = [443, 3389, $TOX_PORT]" >> $TOX_BOOTSTRAP_CONFIG
521
-    echo 'enable_motd = true' >> $TOX_BOOTSTRAP_CONFIG
522
-    echo 'motd = "tox-bootstrapd"' >> $TOX_BOOTSTRAP_CONFIG
523
-
524
-    if [ $TOX_NODES ]; then
525
-        echo 'bootstrap_nodes = (' >> $TOX_BOOTSTRAP_CONFIG
526
-        toxcount=0
527
-        while [ "x${TOX_NODES[toxcount]}" != "x" ]
528
-        do
529
-            toxval_ipv4=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $1}')
530
-            toxval_ipv6=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $2}')
531
-            toxval_port=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $3}')
532
-            toxval_pubkey=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $4}')
533
-            toxval_maintainer=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $5}')
534
-            echo "{ // $toxval_maintainer" >> $TOX_BOOTSTRAP_CONFIG
535
-            if [[ $toxval_ipv6 != 'NONE' ]]; then
536
-                echo "  address = \"$toxval_ipv6\"" >> $TOX_BOOTSTRAP_CONFIG
537
-            else
538
-                echo "  address = \"$toxval_ipv4\"" >> $TOX_BOOTSTRAP_CONFIG
539
-            fi
540
-            echo "  port = $toxval_port" >> $TOX_BOOTSTRAP_CONFIG
541
-            echo "  public_key = \"$toxval_pubkey\"" >> $TOX_BOOTSTRAP_CONFIG
542
-            toxcount=$(( $toxcount + 1 ))
543
-            if [ "x${TOX_NODES[toxcount]}" != "x" ]; then
544
-                echo "}," >> $TOX_BOOTSTRAP_CONFIG
545
-            else
546
-                echo "}" >> $TOX_BOOTSTRAP_CONFIG
547
-            fi
548
-        done
549
-        echo ')' >> $TOX_BOOTSTRAP_CONFIG
550
-    fi
551
-
552
-    if [ ! -f $rootdir/$INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service ]; then
553
-        echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service"
554
-        return
555
-    fi
556
-    cp $rootdir/$INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service $rootdir/etc/systemd/system/
557
-    sed -i 's|ExecStart=.*|ExecStart=/usr/local/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf|g' $rootdir/etc/systemd/system/tox-bootstrapd.service
558
-
559
-    $CHROOT_PREFIX systemctl daemon-reload
560
-    $CHROOT_PREFIX systemctl enable tox-bootstrapd.service
475
+	$CHROOT_PREFIX apt-get -y install build-essential libtool autotools-dev
476
+	$CHROOT_PREFIX apt-get -y install automake checkinstall check git yasm
477
+	$CHROOT_PREFIX apt-get -y install libsodium13 libsodium-dev libcap2-bin
478
+	$CHROOT_PREFIX apt-get -y install libconfig9 libconfig-dev
479
+
480
+	$CHROOT_PREFIX git_clone $TOX_REPO $INSTALL_DIR/toxcore
481
+	$CHROOT_PREFIX cd $INSTALL_DIR/toxcore
482
+	$CHROOT_PREFIX git checkout $TOX_COMMIT -b $TOX_COMMIT
483
+
484
+	$CHROOT_PREFIX autoreconf -i
485
+	$CHROOT_PREFIX ./configure --enable-daemon --disable-av
486
+	if [ ! "$?" = "0" ]; then
487
+		return
488
+	fi
489
+	$CHROOT_PREFIX make
490
+	if [ ! "$?" = "0" ]; then
491
+		return
492
+	fi
493
+	$CHROOT_PREFIX make install
494
+	$CHROOT_PREFIX cp /usr/local/lib/libtoxcore* /usr/lib/
495
+
496
+	if [ ! -f $rootdir/usr/local/bin/tox-bootstrapd ]; then
497
+		echo $"File not found /usr/local/bin/tox-bootstrapd"
498
+		return
499
+	fi
500
+
501
+	$CHROOT_PREFIX useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment $"Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
502
+	$CHROOT_PREFIX chmod 700 /var/lib/tox-bootstrapd
503
+	if [ ! -f $rootdir/$INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf ]; then
504
+		echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.conf"
505
+	fi
506
+	# remove Maildir
507
+	if [ -d $rootdir/var/lib/tox-bootstrapd/Maildir ]; then
508
+		rm -rf $rootdir/var/lib/tox-bootstrapd/Maildir
509
+	fi
510
+
511
+	# create configuration file
512
+	TOX_BOOTSTRAP_CONFIG=${rootdir}/etc/tox-bootstrapd.conf
513
+	echo "port = $TOX_PORT" > $TOX_BOOTSTRAP_CONFIG
514
+	echo 'keys_file_path = "/var/lib/tox-bootstrapd/keys"' >> $TOX_BOOTSTRAP_CONFIG
515
+	echo 'pid_file_path = "/var/run/tox-bootstrapd/tox-bootstrapd.pid"' >> $TOX_BOOTSTRAP_CONFIG
516
+	echo 'enable_ipv6 = true' >> $TOX_BOOTSTRAP_CONFIG
517
+	echo 'enable_ipv4_fallback = true' >> $TOX_BOOTSTRAP_CONFIG
518
+	echo 'enable_lan_discovery = true' >> $TOX_BOOTSTRAP_CONFIG
519
+	echo 'enable_tcp_relay = true' >> $TOX_BOOTSTRAP_CONFIG
520
+	echo "tcp_relay_ports = [443, 3389, $TOX_PORT]" >> $TOX_BOOTSTRAP_CONFIG
521
+	echo 'enable_motd = true' >> $TOX_BOOTSTRAP_CONFIG
522
+	echo 'motd = "tox-bootstrapd"' >> $TOX_BOOTSTRAP_CONFIG
523
+
524
+	if [ $TOX_NODES ]; then
525
+		echo 'bootstrap_nodes = (' >> $TOX_BOOTSTRAP_CONFIG
526
+		toxcount=0
527
+		while [ "x${TOX_NODES[toxcount]}" != "x" ]
528
+		do
529
+			toxval_ipv4=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $1}')
530
+			toxval_ipv6=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $2}')
531
+			toxval_port=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $3}')
532
+			toxval_pubkey=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $4}')
533
+			toxval_maintainer=$(echo $TOX_NODES[toxcount] | awk -F ',' '{print $5}')
534
+			echo "{ // $toxval_maintainer" >> $TOX_BOOTSTRAP_CONFIG
535
+			if [[ $toxval_ipv6 != 'NONE' ]]; then
536
+				echo "  address = \"$toxval_ipv6\"" >> $TOX_BOOTSTRAP_CONFIG
537
+			else
538
+				echo "  address = \"$toxval_ipv4\"" >> $TOX_BOOTSTRAP_CONFIG
539
+			fi
540
+			echo "  port = $toxval_port" >> $TOX_BOOTSTRAP_CONFIG
541
+			echo "  public_key = \"$toxval_pubkey\"" >> $TOX_BOOTSTRAP_CONFIG
542
+			toxcount=$(( $toxcount + 1 ))
543
+			if [ "x${TOX_NODES[toxcount]}" != "x" ]; then
544
+				echo "}," >> $TOX_BOOTSTRAP_CONFIG
545
+			else
546
+				echo "}" >> $TOX_BOOTSTRAP_CONFIG
547
+			fi
548
+		done
549
+		echo ')' >> $TOX_BOOTSTRAP_CONFIG
550
+	fi
551
+
552
+	if [ ! -f $rootdir/$INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service ]; then
553
+		echo $"File not found $INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service"
554
+		return
555
+	fi
556
+	cp $rootdir/$INSTALL_DIR/toxcore/other/bootstrap_daemon/tox-bootstrapd.service $rootdir/etc/systemd/system/
557
+	sed -i 's|ExecStart=.*|ExecStart=/usr/local/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf|g' $rootdir/etc/systemd/system/tox-bootstrapd.service
558
+
559
+	$CHROOT_PREFIX systemctl daemon-reload
560
+	$CHROOT_PREFIX systemctl enable tox-bootstrapd.service
561 561
 }
562 562
 
563 563
 function mesh_tox_client {