From 18ab4b14261c0c6da3bbe8d6a30a633d99d3cb2a Mon Sep 17 00:00:00 2001 From: "Kirill A. Korinsky" Date: Wed, 22 Sep 2021 00:32:26 +0200 Subject: [PATCH 1/4] Added notes about MacPorts --- docs/guides/main.rst | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/guides/main.rst b/docs/guides/main.rst index 04bbc2ae9..7b9aa945a 100644 --- a/docs/guides/main.rst +++ b/docs/guides/main.rst @@ -12,9 +12,11 @@ Installing You will need Python. Beets works on Python 3.6 or later. -* **macOS** 11 (Big Sur) includes Python 3.8 out of the box. - You can opt for a more recent Python installing it via `Homebrew`_: - ``brew install python3`` +* On **macOS**, there's a `MacPorts`_ port. macOS 11 (Big Sur) includes Python + 3.8 out of the box and you may install it via ``pip``. You can opt for a more + recent Python installing it via `Homebrew`_: ``brew install python3`` for older + versions. There's also a MacPorts port. Just run ``port install beets`` or + ``port install beets-full`` to install it with a lot of 3rd party plugins. * On **Debian or Ubuntu**, depending on the version, beets is available as an official package (`Debian details`_, `Ubuntu details`_), so try typing: @@ -55,6 +57,7 @@ Beets works on Python 3.6 or later. .. _OpenBSD: http://openports.se/audio/beets .. _Arch community: https://www.archlinux.org/packages/community/any/beets/ .. _NixOS: https://github.com/NixOS/nixpkgs/tree/master/pkgs/tools/audio/beets +.. _MacPorts: https://www.macports.org If you have `pip`_, just say ``pip install beets`` (or ``pip install --user beets`` if you run into permissions problems). @@ -71,14 +74,14 @@ new versions. .. _@b33ts: https://twitter.com/b33ts -Installing on macOS 10.11 and Higher -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Installing by hand on macOS 10.11 and Higher +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Starting with version 10.11 (El Capitan), macOS has a new security feature called `System Integrity Protection`_ (SIP) that prevents you from modifying -some parts of the system. This means that some ``pip`` commands may fail with -a permissions error. (You probably *won't* run into this if you've installed -Python yourself with `Homebrew`_ or otherwise.) +some parts of the system. This means that some ``pip`` commands may fail with a +permissions error. (You probably *won't* run into this if you've installed +Python yourself with `Homebrew`_ or otherwise. You can also try `MacPorts`_) If this happens, you can install beets for the current user only by typing ``pip install --user beets``. If you do that, you might want to add From 371397df873ff5959e96c94a417f9fb4d256c456 Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Wed, 22 Sep 2021 10:31:46 -0400 Subject: [PATCH 2/4] Little docs tweaks --- docs/guides/main.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/guides/main.rst b/docs/guides/main.rst index 7b9aa945a..6b42522ec 100644 --- a/docs/guides/main.rst +++ b/docs/guides/main.rst @@ -12,11 +12,11 @@ Installing You will need Python. Beets works on Python 3.6 or later. -* On **macOS**, there's a `MacPorts`_ port. macOS 11 (Big Sur) includes Python - 3.8 out of the box and you may install it via ``pip``. You can opt for a more - recent Python installing it via `Homebrew`_: ``brew install python3`` for older - versions. There's also a MacPorts port. Just run ``port install beets`` or - ``port install beets-full`` to install it with a lot of 3rd party plugins. +* **macOS** 11 (Big Sur) includes Python 3.8 out of the box. + You can opt for a more recent Python installing it via `Homebrew`_ + (``brew install python3``). + There's also a `MacPorts`_ port. Run ``port install beets`` or + ``port install beets-full`` to include many third-party plugins. * On **Debian or Ubuntu**, depending on the version, beets is available as an official package (`Debian details`_, `Ubuntu details`_), so try typing: @@ -74,7 +74,7 @@ new versions. .. _@b33ts: https://twitter.com/b33ts -Installing by hand on macOS 10.11 and Higher +Installing by Hand on macOS 10.11 and Higher ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Starting with version 10.11 (El Capitan), macOS has a new security feature From 9eeb86c798ec6ff9025aed6334a0f0a17bbd14ac Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Wed, 22 Sep 2021 10:34:55 -0400 Subject: [PATCH 3/4] Fix ReST syntax --- docs/guides/main.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/main.rst b/docs/guides/main.rst index 6b42522ec..a4d4b8a35 100644 --- a/docs/guides/main.rst +++ b/docs/guides/main.rst @@ -16,7 +16,7 @@ Beets works on Python 3.6 or later. You can opt for a more recent Python installing it via `Homebrew`_ (``brew install python3``). There's also a `MacPorts`_ port. Run ``port install beets`` or - ``port install beets-full`` to include many third-party plugins. + ``port install beets-full`` to include many third-party plugins. * On **Debian or Ubuntu**, depending on the version, beets is available as an official package (`Debian details`_, `Ubuntu details`_), so try typing: From ef742c82efe98c1e5fc3098e71398c10cb649dba Mon Sep 17 00:00:00 2001 From: Adrian Sampson Date: Wed, 22 Sep 2021 10:36:49 -0400 Subject: [PATCH 4/4] Add missing period --- docs/guides/main.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/main.rst b/docs/guides/main.rst index a4d4b8a35..5776dc1c3 100644 --- a/docs/guides/main.rst +++ b/docs/guides/main.rst @@ -81,7 +81,7 @@ Starting with version 10.11 (El Capitan), macOS has a new security feature called `System Integrity Protection`_ (SIP) that prevents you from modifying some parts of the system. This means that some ``pip`` commands may fail with a permissions error. (You probably *won't* run into this if you've installed -Python yourself with `Homebrew`_ or otherwise. You can also try `MacPorts`_) +Python yourself with `Homebrew`_ or otherwise. You can also try `MacPorts`_.) If this happens, you can install beets for the current user only by typing ``pip install --user beets``. If you do that, you might want to add