summaryrefslogtreecommitdiff
path: root/doc/install
diff options
context:
space:
mode:
Diffstat (limited to 'doc/install')
-rw-r--r--doc/install/Homebrew-cask.mdwn3
-rw-r--r--doc/install/OSX.mdwn6
-rw-r--r--doc/install/OSX/comment_12_17b84f51de6bed88e373350b194c8a8d._comment10
3 files changed, 16 insertions, 3 deletions
diff --git a/doc/install/Homebrew-cask.mdwn b/doc/install/Homebrew-cask.mdwn
new file mode 100644
index 000000000..a7517f7ec
--- /dev/null
+++ b/doc/install/Homebrew-cask.mdwn
@@ -0,0 +1,3 @@
+[Homebrew Cask](http://caskroom.io) has a [cask](https://github.com/caskroom/homebrew-cask/blob/master/Casks/git-annex.rb) for git-annex.
+
+Homebrew cask users can simply run `brew cask install git-annex` to install git-annex and git-annex-shell from the OSX binary images.
diff --git a/doc/install/OSX.mdwn b/doc/install/OSX.mdwn
index 7d272be58..b1ff1cc85 100644
--- a/doc/install/OSX.mdwn
+++ b/doc/install/OSX.mdwn
@@ -3,7 +3,7 @@
[[!img /assistant/osx-app.png align=right link=/assistant]]
For easy installation, use the prebuilt app bundle.
-* 10.10 Yosemite / 10.9 Mavericks: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.10_Yosemite/git-annex.dmg)
+* 10.11 El Capitan / 10.10 Yosemite / 10.9 Mavericks: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.10_Yosemite/git-annex.dmg)
* 10.8.2 Mountain Lion: [git-annex.dmg.bz2](https://downloads.kitenet.net/git-annex/OSX/current/10.8.2_Mountain_Lion/git-annex.dmg.bz2) **warning: not being updated any longer**
* 10.7.5 Lion: [git-annex.dmg](https://downloads.kitenet.net/git-annex/OSX/current/10.7.5_Lion/git-annex.dmg) **warning: not being updated any longer**
@@ -21,14 +21,14 @@ several more. Handy if you don't otherwise have git installed.
## autobuilds
[[Joey]] autobuilds the app for 10.10 Yosemite
-(also reported to work on 10.9 Mavericks).
+(also reported to work on 10.9 Mavericks and 10.11 El Capitan).
Thanks to Kevin McKenzie for hosting the autobuilder.
* [autobuild of git-annex.dmg](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-yosemite/git-annex.dmg) ([build logs](https://downloads.kitenet.net/git-annex/autobuild/x86_64-apple-yosemite/))
## using Homebrew
-git-annex is now [[available in Homebrew|Homebrew]]!
+git-annex is now [[available in Homebrew|Homebrew]] (source) as well as [[available in Homebrew Cask|Homebrew-cask]] (binary).
## using MacPorts
diff --git a/doc/install/OSX/comment_12_17b84f51de6bed88e373350b194c8a8d._comment b/doc/install/OSX/comment_12_17b84f51de6bed88e373350b194c8a8d._comment
new file mode 100644
index 000000000..8f937d1b8
--- /dev/null
+++ b/doc/install/OSX/comment_12_17b84f51de6bed88e373350b194c8a8d._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="andrew.grangaard@bf525d11f8ebfbfb0976f7df2301aa0f36668f59"
+ nickname="andrew.grangaard"
+ subject="10.10 build works on El Capitan (10.11)"
+ date="2016-02-02T01:30:45Z"
+ content="""
+The OSX 10.10 build works fine on my 10.11 El Capitan machine. Updated this page to reflect that.
+
+git-annex is also in 'brew cask', automating installation from the OSX binaries. I've sent [PR 18105](https://github.com/caskroom/homebrew-cask/pull/18105) to the brew cask team to get the cask to work for 10.11.
+"""]]