diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-12-27 15:30:39 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-12-27 15:30:39 -0800 |
| commit | ec3a6428b88b213dd9e5e0b4152cb22a3257c41e (patch) | |
| tree | 15d2add280e9fd1609afd3fea7048a5b1ad08b8f /ext/installfiles/mac | |
| parent | 7a6fe203ee890f26bd9eb27e90f7306e33623a69 (diff) | |
| download | infinitytier-ec3a6428b88b213dd9e5e0b4152cb22a3257c41e.tar.gz infinitytier-ec3a6428b88b213dd9e5e0b4152cb22a3257c41e.zip | |
Mac installation scripts fixes.
Diffstat (limited to 'ext/installfiles/mac')
| -rwxr-xr-x | ext/installfiles/mac/launch.sh | 3 | ||||
| -rwxr-xr-x | ext/installfiles/mac/uninstall.sh | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/installfiles/mac/launch.sh b/ext/installfiles/mac/launch.sh index 5128fdd9..ed517029 100755 --- a/ext/installfiles/mac/launch.sh +++ b/ext/installfiles/mac/launch.sh @@ -8,7 +8,8 @@ export PATH="/bin:/usr/bin:/sbin:/usr/sbin:$zthome" # Uninstall if the .app has been thrown away if [ ! -d "$ztapp" ]; then if [ -e "$zthome/uninstall.sh" ]; then - exec "$zthome/uninstall.sh" + cd "$zthome" + ./uninstall.sh -q exit fi fi diff --git a/ext/installfiles/mac/uninstall.sh b/ext/installfiles/mac/uninstall.sh index 626db73f..9d350709 100755 --- a/ext/installfiles/mac/uninstall.sh +++ b/ext/installfiles/mac/uninstall.sh @@ -18,11 +18,11 @@ if [ "$1" = "-q" ]; then fi echo - + if [ $quickAndQuiet -eq 0 ]; then - echo "This will uninstall ZeroTier One, hit CTRL+C to abort." - echo "Waiting 5 seconds..." - sleep 5 + echo "This will uninstall ZeroTier One, hit CTRL+C to abort." + echo "Waiting 5 seconds..." + sleep 5 fi echo "Unloading and removing LaunchDaemons item..." |