From f27923a97c874a6230148e2a79b52060cafe1e94 Mon Sep 17 00:00:00 2001
From: Charles de Beauchesne <charles.de.beauchesne@gmail.com>
Date: Wed, 6 Oct 2021 09:09:46 +0200
Subject: [PATCH] Save 3 keystroke on build.sh

---
 docs/CI/README.md     | 2 +-
 docs/execute/build.md | 7 +++----
 utils/build/README.md | 3 ++-
 utils/build/build.sh  | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/CI/README.md b/docs/CI/README.md
index 01b86a51f89..a850e9bc6ab 100644
--- a/docs/CI/README.md
+++ b/docs/CI/README.md
@@ -8,7 +8,7 @@ A valid `DD_API_KEY` env var for staging must be set.
 
 1. Clone this repo
 2. Copy paste your components' build inside `./binaries` (See [documentation](./binaries.md))
-3. `./build.sh` with relevant `library` (see [documentation](../execute/build.md)). Exemple: `./build.sh -l java`
+3. `./build.sh` with relevant `library` (see [documentation](../execute/build.md)). Exemple: `./build.sh java`
 4. `./run.sh`
 
 You will find different template:
diff --git a/docs/execute/build.md b/docs/execute/build.md
index 4459fe05c2f..b100a265d24 100644
--- a/docs/execute/build.md
+++ b/docs/execute/build.md
@@ -7,13 +7,12 @@ Build images used for system tests.
 ## Usage
 
 ```bash
-    ./build.sh [--library <library_name>] [--images <image_names>] [--weblog-variant <variant_name>]
+    ./build.sh <library_name> [--images <image_names>] [--weblog-variant <variant_name>]
 ```
 
 ## Options
 
-* `-l`: library to test See LIBRARIES section. Default: `nodejs`
-* `--library`: Same as `-l`
+* `<library_name>`: library to test. See LIBRARIES section.
 * `-i`: Comma separated list of images you need to build. See *Image names* section for possible values. Default: all of them
 * `--images`: Same as `-i`
 * `-w`: Name of a [weblog](../edit/weblog.md) variation
@@ -59,6 +58,6 @@ version **against** production version of other components.
 
 You can define your setup in environment variable in a `.env` file. Here is the mapping: 
 
+* `<library_name>` => `TEST_LIBRARY`
 * `-i`/`--images` => `BUILD_IMAGES`
-* `-l`/`--library` => `TEST_LIBRARY`
 * `-w`/`--weblog-variant` => `WEBLOG_VARIANT`
diff --git a/utils/build/README.md b/utils/build/README.md
index d0f38289445..1b789031106 100644
--- a/utils/build/README.md
+++ b/utils/build/README.md
@@ -5,8 +5,9 @@ DESCRIPTION
 
 USAGE
 
-    ./build.sh [--images <image_names>] [--library <library_name>] [--weblog-variant <variant_name>]
+    ./build.sh <library_name> [--images <image_names>] [--weblog-variant <variant_name>]
 
+<library_name> can be one of cpp, dotnet, golang, java, nodejs, php, python or ruby.
 
 More info on https://github.com/DataDog/system-tests/blob/master/docs/CLI/build.md
 
diff --git a/utils/build/build.sh b/utils/build/build.sh
index ba3fa501acc..a768f3fbb96 100755
--- a/utils/build/build.sh
+++ b/utils/build/build.sh
@@ -13,6 +13,7 @@ WEBLOG_VARIANT=${WEBLOG_VARIANT:-${HTTP_FRAMEWORK}}
 
 while [[ "$#" -gt 0 ]]; do
     case $1 in
+        cpp|dotnet|golang|java|nodejs|php|python|ruby) TEST_LIBRARY="$1";;
         -l|--library) TEST_LIBRARY="$2"; shift ;;
         -i|--images) BUILD_IMAGES="$2"; shift ;;
         -w|--weblog-variant) WEBLOG_VARIANT="$2"; shift ;;