gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac installation scripts fixes.

Browse Source
This commit is contained in:
Adam Ierymenko
2013-12-27 15:30:39 -08:00
parent 7a6fe203ee
commit ec3a6428b8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/installfiles/mac/launch.sh
View File

@@ -8,7 +8,8 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin:$zthome"
# Uninstall if the .app has been thrown away # Uninstall if the .app has been thrown away
if [ ! -d "$ztapp" ]; then if [ ! -d "$ztapp" ]; then
if [ -e "$zthome/uninstall.sh" ]; then if [ -e "$zthome/uninstall.sh" ]; then
exec "$zthome/uninstall.sh" cd "$zthome"
./uninstall.sh -q
exit exit
fi fi
fi fi

8
ext/installfiles/mac/uninstall.sh
View File

@@ -18,11 +18,11 @@ if [ "$1" = "-q" ]; then
fi fi
echo echo
if [ $quickAndQuiet -eq 0 ]; then if [ $quickAndQuiet -eq 0 ]; then
echo "This will uninstall ZeroTier One, hit CTRL+C to abort." echo "This will uninstall ZeroTier One, hit CTRL+C to abort."
echo "Waiting 5 seconds..." echo "Waiting 5 seconds..."
sleep 5 sleep 5
fi fi
echo "Unloading and removing LaunchDaemons item..." echo "Unloading and removing LaunchDaemons item..."