Fix: Additional OS X docs from @bnmetp.

Author: bjones1

docker/README.rst

@@ -3,8 +3,7 @@ Docker Deployment
 
 .. TODO
 
-    See https://github.com/RunestoneInteractive/RunestoneServer/issues/1973 for ideas on how to improve this still-complex problem.
-
+    See https://github.com/RunestoneInteractive/RunestoneServer/issues/1973 for ideas on how to improve this still-complex problem. See https://github.com/RunestoneInteractive/RunestoneServer/pull/1977 for OS X problems and fixes.
 
 .. note::
 
@@ -41,6 +40,7 @@ OS X
 ^^^^
 Open a Terminal. In the Terminal:
 
+#.  Edit ``/etc/paths``; add ``/opt/homebrew/bin`` as the first line in that file.
 #.  `Install Homebrew <https://brew.sh/#install>`_.
 #.  Execute ``brew install python docker``.
 #.  Run the newly-installed Docker Desktop application.
@@ -54,7 +54,7 @@ Windows
 If running on Windows, either:
 
     `Install Ubuntu on WSL2 <https://ubuntu.com/tutorials/install-ubuntu-on-wsl2-on-windows-10#1-overview>`_. Next, install then run
-    `Docker Desktop`_; see the note above on the initialization process.
+    `Docker Desktop <https://docs.docker.com/desktop/install/windows-install/>`_; see the note above on the initialization process.
 
     **OR**
 
@@ -140,7 +140,6 @@ This process may take a few minutes to complete. When it does:
 #.  **Reboot your computer** to update your group membership.
 #.  Run the Docker Desktop if using WSL2 on Windows or using OS X.
 #.  Open a terminal.
-#.  **OS X only**: Activate your virtual environment -- at the terminal, execute ``source rsdocker/rsvenv/bin/activate``.
 
 
 4. Build the necessary containers
@@ -273,7 +272,7 @@ After cloning a book, you may need to add it to the database.  Most of the stand
 
     PreTeXt authors, see `Publishing to Runestone Academy <https://pretextbook.org/doc/guide/html/sec-publishing-to-runestone-academy.html>`_.  After that, you can build a pretext book just like building a Runestone book ``rsmanage build --ptx coursename``
 
-The following information applies only *authoring* books using the Runestone. 
+The following information applies only *authoring* books using the Runestone.
 
 .. warning::
 
@@ -357,7 +356,6 @@ Before using ``docker-tools`` or ``rsmanage``:
 
 #.  Run the Docker Desktop if using WSL2 on Windows or using OS X.
 #.  Open a terminal.
-#.  **OS X only**: Activate your virtual environment -- at the terminal, execute ``source rsdocker/rsvenv/bin/activate``.
 #.  At the terminal, execute ``cd rsdocker/RunestoneServer``.
 
 

docker/docker_tools.py

@@ -162,19 +162,6 @@ def pip_user() -> str:
 
 # Third-party bootstrap
 # ---------------------
-# On OS X, create then activate a venv. Otherwise, the ``docker-tools`` and ``rsmanage`` scripts don't get put in the default path (while on Linux they do) when not in a venv. Rather than require users to manually edit their path, use a venv and require them to activate the venv before running these scripts.
-if is_darwin and not IN_VENV:
-    # If the repo's already cloned, but the venv isn't activated, create it if it doesn't exist.
-    venv_path = (wd / (("../../" if IN_REPO else "") + "rsvenv")).resolve()
-    if not venv_path.is_dir():
-        xqt(f"python3 -m venv {venv_path}")
-    # pip doesn't provide ``activate_this.py`` (Poetry does). For now, ask the user to run this in the created venv.
-    sys.exit(
-        "Phase 1 init complete. Execute:\n"
-        f"  source {venv_path}/bin/activate\n"
-        "then re-run this command to continue to phase 2."
-    )
-
 # This comes after importing ``ci_utils``, since we use that to install click if necessary.
 try:
     import click
@@ -359,7 +346,7 @@ def init(
     # Provide server-related CLIs. While installing this sooner would be great, we can't assume that the prereqs (the downloaded repo) are available.
     check_install(f"{sys.executable} -m pip --version", "python3-pip")
     xqt(
-        # Note: Outside a venv, OS X installs these into a place that's not in the default $PATH, making the scripts ``docker-tools`` and ``rsmanage`` not work unless the user manually adds the path. Add the ``--verbose`` flag to the install commands below to see where the scripts are place on OS X.
+        # Note: Sometimes, OS X installs these into a place that's not in the default $PATH, making the scripts ``docker-tools`` and ``rsmanage`` not work unless the user manually adds the path. Add the ``--verbose`` flag to the install commands below to see where the scripts are placed on OS X.
         f"{sys.executable} -m pip install {pip_user()} -e docker",
         f"{sys.executable} -m pip install {pip_user()} -e rsmanage",
     )
@@ -369,6 +356,7 @@ def init(
         print(
             "\n" + "*" * 80 + "\n"
             "Downloaded the RunestoneServer repo. You must \n"
+            '"cd RunestoneServer" before running this script again.'
         )
     if did_group_add:
         print(