Browse Source

Bump qtox commit to include video fix

Bob Mottram 8 years ago
parent
commit
c625f0d56a
1 changed files with 35 additions and 35 deletions
  1. 35
    35
      src/freedombone-app-tox

+ 35
- 35
src/freedombone-app-tox View File

47
 TOXIC_FILE=/usr/local/bin/toxic
47
 TOXIC_FILE=/usr/local/bin/toxic
48
 
48
 
49
 QTOX_REPO="https://github.com/bashrc/qTox"
49
 QTOX_REPO="https://github.com/bashrc/qTox"
50
-QTOX_COMMIT='7d951802d0106c17c76460b7011b3fa90cab1485'
50
+QTOX_COMMIT='59352ae797be37a1d51821df4d06ef07e9b870bb'
51
 
51
 
52
 function mesh_install_ffmpeg
52
 function mesh_install_ffmpeg
53
 {
53
 {
216
     make uninstall
216
     make uninstall
217
     rm -rf $INSTALL_DIR/toxid
217
     rm -rf $INSTALL_DIR/toxid
218
     sed -i '/tox_avahi/d' $COMPLETION_FILE
218
     sed -i '/tox_avahi/d' $COMPLETION_FILE
219
-	if [ -f /etc/systemd/system/mesh-sync.service ]; then
220
-		systemctl stop mesh-sync
221
-		systemctl disable mesh-sync
222
-		rm -f /etc/systemd/system/mesh-sync.service
223
-		systemctl daemon-reload
224
-	fi
219
+    if [ -f /etc/systemd/system/mesh-sync.service ]; then
220
+        systemctl stop mesh-sync
221
+        systemctl disable mesh-sync
222
+        rm -f /etc/systemd/system/mesh-sync.service
223
+        systemctl daemon-reload
224
+    fi
225
 }
225
 }
226
 
226
 
227
 function remove_tox_client {
227
 function remove_tox_client {
585
         exit 3621729
585
         exit 3621729
586
     fi
586
     fi
587
 
587
 
588
-	MESH_SYNC_COMMAND=$rootdir/usr/bin/mesh-sync
589
-	echo '#!/bin/bash' > $MESH_SYNC_COMMAND
590
-	echo 'while true' >> $MESH_SYNC_COMMAND
591
-	echo 'do' >> $MESH_SYNC_COMMAND
592
-	echo '    /usr/bin/timeout 20 /usr/local/bin/toxavahi' >> $MESH_SYNC_COMMAND
593
-	echo '    /usr/bin/timeout 20 /usr/local/bin/zeronetavahi' >> $MESH_SYNC_COMMAND
594
-	echo '    sleep 5' >> $MESH_SYNC_COMMAND
595
-	echo 'done' >> $MESH_SYNC_COMMAND
596
-	chmod +x $MESH_SYNC_COMMAND
597
-
598
-	if [ ! -f $rootdir/etc/systemd/system/mesh-sync.service ]; then
599
-		MESH_SYNC_FILENAME=$rootdir/etc/systemd/system/mesh-sync.service
600
-		echo '[Unit]' > $MESH_SYNC_FILENAME
601
-		echo 'Description=mesh-sync - Service publications over avahi' >> $MESH_SYNC_FILENAME
602
-		echo 'After=network.target' >> $MESH_SYNC_FILENAME
603
-		echo '' >> $MESH_SYNC_FILENAME
604
-		echo '[Service]' >> $MESH_SYNC_FILENAME
605
-		echo 'User=root' >> $MESH_SYNC_FILENAME
606
-		echo 'ExecStart=/usr/bin/mesh-sync' >> $MESH_SYNC_FILENAME
607
-		echo 'Restart=on-failure' >> $MESH_SYNC_FILENAME
608
-		echo 'SuccessExitStatus=3 4' >> $MESH_SYNC_FILENAME
609
-		echo 'RestartForceExitStatus=3 4' >> $MESH_SYNC_FILENAME
610
-		echo '' >> $MESH_SYNC_FILENAME
611
-		echo '[Install]' >> $MESH_SYNC_FILENAME
612
-		echo 'WantedBy=multi-user.target' >> $MESH_SYNC_FILENAME
613
-
614
-		chroot "$rootdir" systemctl enable mesh-sync.service
615
-	fi
588
+    MESH_SYNC_COMMAND=$rootdir/usr/bin/mesh-sync
589
+    echo '#!/bin/bash' > $MESH_SYNC_COMMAND
590
+    echo 'while true' >> $MESH_SYNC_COMMAND
591
+    echo 'do' >> $MESH_SYNC_COMMAND
592
+    echo '    /usr/bin/timeout 20 /usr/local/bin/toxavahi' >> $MESH_SYNC_COMMAND
593
+    echo '    /usr/bin/timeout 20 /usr/local/bin/zeronetavahi' >> $MESH_SYNC_COMMAND
594
+    echo '    sleep 5' >> $MESH_SYNC_COMMAND
595
+    echo 'done' >> $MESH_SYNC_COMMAND
596
+    chmod +x $MESH_SYNC_COMMAND
597
+
598
+    if [ ! -f $rootdir/etc/systemd/system/mesh-sync.service ]; then
599
+        MESH_SYNC_FILENAME=$rootdir/etc/systemd/system/mesh-sync.service
600
+        echo '[Unit]' > $MESH_SYNC_FILENAME
601
+        echo 'Description=mesh-sync - Service publications over avahi' >> $MESH_SYNC_FILENAME
602
+        echo 'After=network.target' >> $MESH_SYNC_FILENAME
603
+        echo '' >> $MESH_SYNC_FILENAME
604
+        echo '[Service]' >> $MESH_SYNC_FILENAME
605
+        echo 'User=root' >> $MESH_SYNC_FILENAME
606
+        echo 'ExecStart=/usr/bin/mesh-sync' >> $MESH_SYNC_FILENAME
607
+        echo 'Restart=on-failure' >> $MESH_SYNC_FILENAME
608
+        echo 'SuccessExitStatus=3 4' >> $MESH_SYNC_FILENAME
609
+        echo 'RestartForceExitStatus=3 4' >> $MESH_SYNC_FILENAME
610
+        echo '' >> $MESH_SYNC_FILENAME
611
+        echo '[Install]' >> $MESH_SYNC_FILENAME
612
+        echo 'WantedBy=multi-user.target' >> $MESH_SYNC_FILENAME
613
+
614
+        chroot "$rootdir" systemctl enable mesh-sync.service
615
+    fi
616
 }
616
 }
617
 
617
 
618
 function mesh_tox_client {
618
 function mesh_tox_client {