浏览代码

Update macOS install instructions

Backport of #5677
Manu 4 年之前
父节点
当前提交
15b9cfb50f
共有 1 个文件被更改,包括 14 次插入8 次删除
  1. 14 8
      docs/installation.rst

+ 14 - 8
docs/installation.rst

@@ -48,7 +48,10 @@ Gentoo       `ebuild`_                                     ``emerge borgbackup``
 GNU Guix     `GNU Guix`_                                   ``guix package --install borg``
 GNU Guix     `GNU Guix`_                                   ``guix package --install borg``
 Fedora/RHEL  `Fedora official repository`_                 ``dnf install borgbackup``
 Fedora/RHEL  `Fedora official repository`_                 ``dnf install borgbackup``
 FreeBSD      `FreeBSD ports`_                              ``cd /usr/ports/archivers/py-borgbackup && make install clean``
 FreeBSD      `FreeBSD ports`_                              ``cd /usr/ports/archivers/py-borgbackup && make install clean``
-macOS        `Homebrew`_                                  ``brew install borgbackup``
+macOS        `Homebrew`_                                   | ``brew install borgbackup`` (official formula, **no** FUSE support)
+                                                           | **or**
+                                                           | ``brew install --cask osxfuse`` (`private Tap`_, FUSE support) 
+                                                           | ``brew install borgbackup/tap/borgbackup-fuse``
 Mageia       `cauldron`_                                   ``urpmi borgbackup``
 Mageia       `cauldron`_                                   ``urpmi borgbackup``
 NetBSD       `pkgsrc`_                                     ``pkg_add py-borgbackup``
 NetBSD       `pkgsrc`_                                     ``pkg_add py-borgbackup``
 NixOS        `.nix file`_                                  N/A
 NixOS        `.nix file`_                                  N/A
@@ -73,6 +76,7 @@ Ubuntu       `Ubuntu packages`_, `Ubuntu PPA`_             ``apt install borgbac
 .. _OpenIndiana hipster repository: https://pkg.openindiana.org/hipster/en/search.shtml?token=borg&action=Search
 .. _OpenIndiana hipster repository: https://pkg.openindiana.org/hipster/en/search.shtml?token=borg&action=Search
 .. _openSUSE official repository: https://software.opensuse.org/package/borgbackup
 .. _openSUSE official repository: https://software.opensuse.org/package/borgbackup
 .. _Homebrew: https://formulae.brew.sh/formula/borgbackup
 .. _Homebrew: https://formulae.brew.sh/formula/borgbackup
+.. _private Tap: https://github.com/borgbackup/homebrew-tap
 .. _Raspbian testing: https://archive.raspbian.org/raspbian/pool/main/b/borgbackup/
 .. _Raspbian testing: https://archive.raspbian.org/raspbian/pool/main/b/borgbackup/
 .. _Ubuntu packages: https://packages.ubuntu.com/xenial/borgbackup
 .. _Ubuntu packages: https://packages.ubuntu.com/xenial/borgbackup
 .. _Ubuntu PPA: https://launchpad.net/~costamagnagianfranco/+archive/ubuntu/borgbackup
 .. _Ubuntu PPA: https://launchpad.net/~costamagnagianfranco/+archive/ubuntu/borgbackup
@@ -94,7 +98,9 @@ are available on the releases_ page for the following platforms:
 
 
 * **Linux**: glibc >= 2.19 (ok for most supported Linux releases).
 * **Linux**: glibc >= 2.19 (ok for most supported Linux releases).
   Older glibc releases are untested and may not work.
   Older glibc releases are untested and may not work.
-* **Mac OS X**: 10.12 (unknown whether it works for older releases)
+* **MacOS**: 10.10 or newer (To avoid signing issues download the file via
+  command line **or** remove the ``quarantine`` attribute after downloading:
+  ``$ xattr -dr com.apple.quarantine borg-macosx64.tgz``)
 * **FreeBSD**: 10.3 (unknown whether it works for older releases)
 * **FreeBSD**: 10.3 (unknown whether it works for older releases)
 
 
 ARM binaries are built by Johann Bauer, see: https://borg.bauerj.eu/
 ARM binaries are built by Johann Bauer, see: https://borg.bauerj.eu/
@@ -211,21 +217,21 @@ Alternatively, you can enumerate all build dependencies in the command line::
     python3-pytest python3-setuptools python3-setuptools_scm \
     python3-pytest python3-setuptools python3-setuptools_scm \
     python3-sphinx_rtd_theme python3-llfuse gcc gcc-c++
     python3-sphinx_rtd_theme python3-llfuse gcc gcc-c++
 
 
-Mac OS X
-++++++++
+macOS
++++++
 
 
 When installing via Homebrew_, dependencies are installed automatically. To install
 When installing via Homebrew_, dependencies are installed automatically. To install
 dependencies manually::
 dependencies manually::
 
 
-    brew install python3 openssl
-    brew install pkg-config                            # optional, for FUSE support
+    brew install python3 openssl zstd lz4 xxhash
+    brew install pkg-config
     pip3 install virtualenv
     pip3 install virtualenv
 
 
 For FUSE support to mount the backup archives, you need at least version 3.0 of
 For FUSE support to mount the backup archives, you need at least version 3.0 of
-FUSE for OS X, which is available via `Github
+macFUSE, which is available via `Github
 <https://github.com/osxfuse/osxfuse/releases/latest>`__, or Homebrew::
 <https://github.com/osxfuse/osxfuse/releases/latest>`__, or Homebrew::
 
 
-    brew cask install osxfuse
+    brew install --cask osxfuse
 
 
 For OS X Catalina and later, be aware that you must authorize full disk access.
 For OS X Catalina and later, be aware that you must authorize full disk access.
 It is no longer sufficient to run borg backups as root. If you have not yet
 It is no longer sufficient to run borg backups as root. If you have not yet