From 22684cbe9144f9cf15e2df7dfa55457266caca44 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 29 Oct 2024 10:13:07 -0700
Subject: [PATCH] Improve installation instructions (#1490)

* Refer to https://brew.sh instead of duplicating the
  brew installation command.
* List cmake variables in a markdown table.
* Combine Ubuntu and macOS installation instructions

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
---
 README.md | 71 ++++++++++++++++++++-----------------------------------
 1 file changed, 25 insertions(+), 46 deletions(-)

diff --git a/README.md b/README.md
index 0b6dfc324..c70b18b9b 100644
--- a/README.md
+++ b/README.md
@@ -71,9 +71,9 @@ which version you need, or leave it empty for version 1.
 
 ### macOS
 
-On macOS, add OSRF packages:
+On macOS, after installing the [Homebrew package manager](https://brew.sh),
+add OSRF packages:
   ```sh
-  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
   brew tap osrf/simulation
   ```
 
@@ -129,6 +129,25 @@ git clone https://github.com/gazebosim/sdformat -b sdf<#>
 Be sure to replace `<#>` with a number value, such as 14 or 15, depending on
 which version you need.
 
+### Install dependencies
+
+#### Ubuntu
+
+```sh
+cd sdformat
+sudo apt -y install \
+  $(sort -u $(find . -iname 'packages-'`lsb_release -cs`'.apt' -o -iname 'packages.apt' | tr '\n' ' '))
+```
+
+#### macOS
+
+```sh
+brew install --only-dependencies sdformat<#>
+```
+
+Be sure to replace `<#>` with a number value, such as 14 or 15, depending on
+which version you need.
+
 ### Build from Source
 
 Standard installation can be performed in UNIX systems using the following
@@ -144,12 +163,10 @@ make install
 
 sdformat supported cmake parameters at configuring time:
 
-* `USE_INTERNAL_URDF` (`bool`) [default `False`] <br/>
-  Use an internal copy of urdfdom 1.0.0 instead of look for one
-  installed in the system
-* `USE_UPSTREAM_CFLAGS` (`bool`) [default `True`] <br/>
-  Use the sdformat team compilation flags instead of the common set defined
-  by cmake.
+| Name                  | Type | Default  | Description                          |
+|-----------------------|------|----------|--------------------------------------|
+| `USE_INTERNAL_URDF`   | BOOL | False    | Use an internal copy of urdfdom 1.0.0 instead of looking for one installed in the system |
+| `USE_UPSTREAM_CFLAGS` | BOOL | True     | Use the sdformat team compilation flags instead of the common set defined by cmake.      |
 
 ## Uninstallation
 
@@ -160,44 +177,6 @@ cd build
 make uninstall
 ```
 
-## macOS
-
-### Prerequisites
-
-Clone the repository
-```sh
-git clone https://github.com/gazebosim/sdformat -b sdf<#>
-```
-Be sure to replace `<#>` with a number value, such as 14 or 15, depending on
-which version you need.
-
-Install dependencies
-```sh
-brew install --only-dependencies sdformat<#>
-```
-
-### Build from Source
-
-1. Configure and build
-  ```sh
-  cd sdformat
-  mkdir build
-  cd build
-  cmake .. # Consider specifying -DCMAKE_INSTALL_PREFIX=...
-  make
-  ```
-
-2. Optionally, install and uninstall
-  ```sh
-  sudo make install
-  ```
-
-  To uninstall the software installed with the previous steps:
-  ```sh
-  cd build/
-  sudo make uninstall
-  ```
-
 ## Windows
 
 ### Prerequisites