github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 10:37:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Pick a new random secondary port if we are offline for more than path-timeout seconds (COMA problem workaround).

Browse source
This commit is contained in:
Adam Ierymenko 2021-08-31 16:47:00 -04:00
commit 11b352458e
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 54 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

29
ext/installfiles/mac/preinst.sh
View file

@ -8,7 +8,17 @@ for i in `ps axuwww | tr -s ' ' ',' | grep -F '/Applications/ZeroTier,One.app' |
p=`echo $i | cut -d , -f 2`
if [ ! -z "$u" -a "0$p" -gt 0 ]; then
kill $p >>/dev/null 2>&1
sleep 0.2
sleep 0.5
kill -9 $p >>/dev/null 2>&1
echo "$u" >>/tmp/zt1-gui-restart.tmp
fi
done
for i in `ps axuwww | tr -s ' ' ',' | grep -F '/Applications/ZeroTier.app' | grep -F -v grep | cut -d , -f 1,2 | xargs`; do
u=`echo $i | cut -d , -f 1`
p=`echo $i | cut -d , -f 2`
if [ ! -z "$u" -a "0$p" -gt 0 ]; then
kill $p >>/dev/null 2>&1
sleep 0.5
kill -9 $p >>/dev/null 2>&1
echo "$u" >>/tmp/zt1-gui-restart.tmp
fi
@ -17,23 +27,14 @@ chmod 0600 /tmp/zt1-gui-restart.tmp
if [ -f /Library/LaunchDaemons/com.zerotier.one.plist ]; then
launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1
sleep 5
fi
sleep 1
if [ -d "/Library/Application Support/ZeroTier/One" ]; then
cd "/Library/Application Support/ZeroTier/One"
if [ -f "zerotier-one.pid" ]; then
ztpid=`cat zerotier-one.pid`
if [ "$ztpid" -gt "0" ]; then
kill `cat zerotier-one.pid`
fi
fi
if [ -f '/Library/Application Support/ZeroTier/One/zerotier-one.pid' ]; then
kill -9 `cat /Library/Application Support/ZeroTier/One/zerotier-one.pid`
fi
sleep 1
cd "/Applications"
rm -rf "ZeroTier One.app"
rm -rf "ZeroTier.app"
exit 0