diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-01-03 16:53:00 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-01-03 16:53:00 -0800 |
| commit | 63d605215982108b3ab606324052b00c56c3222c (patch) | |
| tree | 043f617e9222870d2ba97b6548bf3f62ea7f107a /ext/installfiles/mac/install.tmpl.sh | |
| parent | 50043f9cd68c8642300a254cf76967a84d55634c (diff) | |
| download | infinitytier-63d605215982108b3ab606324052b00c56c3222c.tar.gz infinitytier-63d605215982108b3ab606324052b00c56c3222c.zip | |
Mac installer work.
Diffstat (limited to 'ext/installfiles/mac/install.tmpl.sh')
| -rw-r--r-- | ext/installfiles/mac/install.tmpl.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/installfiles/mac/install.tmpl.sh b/ext/installfiles/mac/install.tmpl.sh index a1675b1d..87addba5 100644 --- a/ext/installfiles/mac/install.tmpl.sh +++ b/ext/installfiles/mac/install.tmpl.sh @@ -37,7 +37,7 @@ if [ ! -r "$scriptPath" ]; then fi fi -endMarkerIndex=`grep -b -E '^################' "$scriptPath" | head -n 1 | cut -d : -f 1` +endMarkerIndex=`grep -a -b -E '^################' "$scriptPath" | head -c 16 | cut -d : -f 1` if [ "$endMarkerIndex" -le 100 ]; then echo 'Internal error: unable to find end of script / start of binary data marker.' exit 2 @@ -55,7 +55,7 @@ else tail -c +$blobStart "$scriptPath" | bunzip2 -c | tar -xvop -C / -f - fi -if [ $dryRun -eq 0 -a ! -d "/Applications/ZeroTierOne_app.LATEST" ]; then +if [ $dryRun -eq 0 -a ! -d "/Applications/ZeroTier One_app.LATEST" ]; then echo 'Archive extraction failed, cannot find zerotier-one binary.' exit 2 fi @@ -69,16 +69,16 @@ if [ -d "$ztapp" ]; then currentAppGroup=`stat -f '%g' "$ztapp"` if [ ! -z "$currentAppOwner" -a ! -z "$currentAppGroup" ]; then rm -rf "$ztapp" - mv -f "/Application/ZeroTierOne_app.LATEST" "$ztapp" + mv -f "/Application/ZeroTier One_app.LATEST" "$ztapp" chown -R $currentAppOwner "$ztapp" chgrp -R $currentAppGroup "$ztapp" else rm -rf "$ztapp" - mv -f "/Application/ZeroTierOne_app.LATEST" "$ztapp" + mv -f "/Application/ZeroTier One_app.LATEST" "$ztapp" fi else # If there is no existing app, just drop the shipped one into place - mv -f "/Applications/ZeroTierOne_app.LATEST" "/Applications/ZeroTierOne.app" + mv -f "/Applications/ZeroTier One_app.LATEST" "/Applications/ZeroTier One.app" fi echo 'Installing zerotier-cli command line utility...' |