free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump qtox commit to include video fix

This commit is contained in:
Bob Mottram 2016-08-08 16:11:18 +01:00
parent 427e593a56
commit c625f0d56a
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/freedombone-app-tox
View File

@ -47,7 +47,7 @@ TOXIC_COMMIT='cf16849b374e484a33a4dffa3dfb937b59d537f2'
TOXIC_FILE=/usr/local/bin/toxic
QTOX_REPO="https://github.com/bashrc/qTox"
QTOX_COMMIT='7d951802d0106c17c76460b7011b3fa90cab1485'
QTOX_COMMIT='59352ae797be37a1d51821df4d06ef07e9b870bb'
function mesh_install_ffmpeg
{
@ -216,12 +216,12 @@ function remove_tox_avahi {
make uninstall
rm -rf $INSTALL_DIR/toxid
sed -i '/tox_avahi/d' $COMPLETION_FILE
if [ -f /etc/systemd/system/mesh-sync.service ]; then
systemctl stop mesh-sync
systemctl disable mesh-sync
rm -f /etc/systemd/system/mesh-sync.service
systemctl daemon-reload
fi
if [ -f /etc/systemd/system/mesh-sync.service ]; then
systemctl stop mesh-sync
systemctl disable mesh-sync
rm -f /etc/systemd/system/mesh-sync.service
systemctl daemon-reload
fi
}
function remove_tox_client {
@ -585,34 +585,34 @@ EOF
exit 3621729
fi
MESH_SYNC_COMMAND=$rootdir/usr/bin/mesh-sync
echo '#!/bin/bash' > $MESH_SYNC_COMMAND
echo 'while true' >> $MESH_SYNC_COMMAND
echo 'do' >> $MESH_SYNC_COMMAND
echo ' /usr/bin/timeout 20 /usr/local/bin/toxavahi' >> $MESH_SYNC_COMMAND
echo ' /usr/bin/timeout 20 /usr/local/bin/zeronetavahi' >> $MESH_SYNC_COMMAND
echo ' sleep 5' >> $MESH_SYNC_COMMAND
echo 'done' >> $MESH_SYNC_COMMAND
chmod +x $MESH_SYNC_COMMAND
MESH_SYNC_COMMAND=$rootdir/usr/bin/mesh-sync
echo '#!/bin/bash' > $MESH_SYNC_COMMAND
echo 'while true' >> $MESH_SYNC_COMMAND
echo 'do' >> $MESH_SYNC_COMMAND
echo ' /usr/bin/timeout 20 /usr/local/bin/toxavahi' >> $MESH_SYNC_COMMAND
echo ' /usr/bin/timeout 20 /usr/local/bin/zeronetavahi' >> $MESH_SYNC_COMMAND
echo ' sleep 5' >> $MESH_SYNC_COMMAND
echo 'done' >> $MESH_SYNC_COMMAND
chmod +x $MESH_SYNC_COMMAND
if [ ! -f $rootdir/etc/systemd/system/mesh-sync.service ]; then
MESH_SYNC_FILENAME=$rootdir/etc/systemd/system/mesh-sync.service
echo '[Unit]' > $MESH_SYNC_FILENAME
echo 'Description=mesh-sync - Service publications over avahi' >> $MESH_SYNC_FILENAME
echo 'After=network.target' >> $MESH_SYNC_FILENAME
echo '' >> $MESH_SYNC_FILENAME
echo '[Service]' >> $MESH_SYNC_FILENAME
echo 'User=root' >> $MESH_SYNC_FILENAME
echo 'ExecStart=/usr/bin/mesh-sync' >> $MESH_SYNC_FILENAME
echo 'Restart=on-failure' >> $MESH_SYNC_FILENAME
echo 'SuccessExitStatus=3 4' >> $MESH_SYNC_FILENAME
echo 'RestartForceExitStatus=3 4' >> $MESH_SYNC_FILENAME
echo '' >> $MESH_SYNC_FILENAME
echo '[Install]' >> $MESH_SYNC_FILENAME
echo 'WantedBy=multi-user.target' >> $MESH_SYNC_FILENAME
if [ ! -f $rootdir/etc/systemd/system/mesh-sync.service ]; then
MESH_SYNC_FILENAME=$rootdir/etc/systemd/system/mesh-sync.service
echo '[Unit]' > $MESH_SYNC_FILENAME
echo 'Description=mesh-sync - Service publications over avahi' >> $MESH_SYNC_FILENAME
echo 'After=network.target' >> $MESH_SYNC_FILENAME
echo '' >> $MESH_SYNC_FILENAME
echo '[Service]' >> $MESH_SYNC_FILENAME
echo 'User=root' >> $MESH_SYNC_FILENAME
echo 'ExecStart=/usr/bin/mesh-sync' >> $MESH_SYNC_FILENAME
echo 'Restart=on-failure' >> $MESH_SYNC_FILENAME
echo 'SuccessExitStatus=3 4' >> $MESH_SYNC_FILENAME
echo 'RestartForceExitStatus=3 4' >> $MESH_SYNC_FILENAME
echo '' >> $MESH_SYNC_FILENAME
echo '[Install]' >> $MESH_SYNC_FILENAME
echo 'WantedBy=multi-user.target' >> $MESH_SYNC_FILENAME
chroot "$rootdir" systemctl enable mesh-sync.service
fi
chroot "$rootdir" systemctl enable mesh-sync.service
fi
}
function mesh_tox_client {