From 3f964c9533fbac4c6bf9375fa43781013547731f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 9 Jan 2024 12:28:40 -0800
Subject: [PATCH 001/217] separate make-pip-dependencies and
 make-conda-dependencies scripts

---
 .../devcontainer-feature.json                 |  2 +-
 features/src/rapids-build-utils/install.sh    |  2 +
 .../bin/make-conda-dependencies.sh            | 56 +++++++++++++
 .../rapids-build-utils/bin/make-conda-env.sh  | 58 +++-----------
 .../bin/make-pip-dependencies.sh              | 79 +++++++++++++++++++
 .../rapids-build-utils/bin/make-pip-env.sh    | 79 +++----------------
 6 files changed, 158 insertions(+), 118 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index 588dde878..6adf8ce44 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "24.2.7",
+  "version": "24.2.8",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 49b9fc0dd..d3b0ef70b 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -39,7 +39,9 @@ update-alternatives --install /usr/bin/rapids-pull-repositories             rapi
 update-alternatives --install /usr/bin/rapids-push-repositories             rapids-push-repositories            /opt/rapids-build-utils/bin/push-repositories.sh            0;
 update-alternatives --install /usr/bin/rapids-generate-scripts              rapids-generate-scripts             /opt/rapids-build-utils/bin/generate-scripts.sh             0;
 update-alternatives --install /usr/bin/rapids-join-strings                  rapids-join-strings                 /opt/rapids-build-utils/bin/join-strings.sh                 0;
+update-alternatives --install /usr/bin/rapids-make-conda-dependencies       rapids-make-conda-dependencies      /opt/rapids-build-utils/bin/make-conda-dependencies.sh      0;
 update-alternatives --install /usr/bin/rapids-make-conda-env                rapids-make-conda-env               /opt/rapids-build-utils/bin/make-conda-env.sh               0;
+update-alternatives --install /usr/bin/rapids-make-pip-dependencies         rapids-make-pip-dependencies        /opt/rapids-build-utils/bin/make-pip-dependencies.sh        0;
 update-alternatives --install /usr/bin/rapids-make-pip-env                  rapids-make-pip-env                 /opt/rapids-build-utils/bin/make-pip-env.sh                 0;
 update-alternatives --install /usr/bin/rapids-make-vscode-workspace         rapids-make-vscode-workspace        /opt/rapids-build-utils/bin/make-vscode-workspace.sh        0;
 update-alternatives --install /usr/bin/rapids-parse-cmake-args              rapids-parse-cmake-args             /opt/rapids-build-utils/bin/parse-cmake-args.sh             0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
new file mode 100755
index 000000000..7c548e8fa
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -0,0 +1,56 @@
+#! /usr/bin/env bash
+
+make_conda_dependencies() {
+
+    set -euo pipefail;
+
+    local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
+
+    local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
+    python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
+
+    local conda_noinstall=();
+    local conda_env_yamls=();
+
+    eval "$(                                  \
+        rapids-list-repos "$@"                \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
+    local i;
+
+    for ((i=0; i < ${repos_length:-0}; i+=1)); do
+
+        local repo="repos_${i}";
+        local repo_name="${repo}_name";
+        local repo_path="${repo}_path";
+
+        if [ -f ~/"${!repo_path}/dependencies.yaml" ]; then
+            conda_env_yamls+=("/tmp/${!repo_name}.yaml");
+            conda_noinstall+=("$(rapids-python-conda-pkg-names --repo "${!repo_name}")");
+            echo "Generating ${!repo_name}'s conda env yml" 1>&2;
+            /opt/conda/bin/rapids-dependency-file-generator \
+                --file_key all \
+                --output conda \
+                --config ~/"${!repo_path}/dependencies.yaml" \
+                --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
+            > /tmp/${!repo_name}.yaml;
+        fi
+    done
+
+    if test ${#conda_env_yamls[@]} -gt 0; then
+
+        # Generate a combined conda env yaml file.
+        /opt/conda/bin/conda-merge ${conda_env_yamls[@]} \
+          | grep -v '^name:' \
+          | grep -v -P '^(.*?)\-(.*?)rapids-(.*?)$' \
+          | grep -v -P '^(.*?)\-(.*?)(\.git\@[^(main|master)])(.*?)$' \
+          | grep -v -P "^(.*?)\-(.*?)($(rapids-join-strings "|" ${conda_noinstall[@]}))(=.*|>.*|<.*)?$" \
+          ;
+
+        rm ${conda_env_yamls[@]};
+    fi
+}
+
+(make_conda_dependencies "$@");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index a9c75e003..88c3453fd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -4,65 +4,27 @@ make_conda_env() {
 
     set -euo pipefail;
 
+    local force=;
     local env_name="${1}";
     local env_file_name="${env_name}.yml";
 
+    eval "$(                                  \
+        devcontainer-utils-parse-args --names '
+            f|force                           |
+        ' - <<< "${@:2}"                      \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
     # Remove the current conda env if called with `-f|--force`
-    if echo "${@:2}" | grep -qE '(\-f|\-\-force)'; then
+    if test -n "${f:-${force:-}}"; then
         rm -rf "$HOME/.conda/envs/${env_name}" \
                "$HOME/.conda/envs/${env_file_name}";
     fi
 
-    local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
-
-    local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
-    python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
-
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.conda/envs/${env_file_name})";
 
-    local conda_noinstall=();
-    local conda_env_yamls=();
-
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    local i;
-
-    for ((i=0; i < ${repos_length:-0}; i+=1)); do
-
-        local repo="repos_${i}";
-        local repo_name="${repo}_name";
-        local repo_path="${repo}_path";
-
-        if [ -f ~/"${!repo_path}/dependencies.yaml" ]; then
-            conda_env_yamls+=("/tmp/${!repo_name}.yaml");
-            conda_noinstall+=("$(rapids-python-conda-pkg-names --repo "${!repo_name}")");
-            echo "Generating ${!repo_name}'s conda env yml" 1>&2;
-            /opt/conda/bin/rapids-dependency-file-generator \
-                --file_key all \
-                --output conda \
-                --config ~/"${!repo_path}/dependencies.yaml" \
-                --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
-            > /tmp/${!repo_name}.yaml;
-        fi
-    done
-
-    if test ${#conda_env_yamls[@]} -gt 0; then
-
-        # Generate a combined conda env yaml file.
-        /opt/conda/bin/conda-merge ${conda_env_yamls[@]} \
-          | grep -v '^name:' \
-          | grep -v -P '^(.*?)\-(.*?)rapids-(.*?)$' \
-          | grep -v -P '^(.*?)\-(.*?)(\.git\@[^(main|master)])(.*?)$' \
-          | grep -v -P "^(.*?)\-(.*?)($(rapids-join-strings "|" ${conda_noinstall[@]}))(=.*|>.*|<.*)?$" \
-        > "${new_env_path}";
-
-        rm ${conda_env_yamls[@]};
-    fi
+    make-conda-dependencies > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
new file mode 100755
index 000000000..145421c2f
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -0,0 +1,79 @@
+#! /usr/bin/env bash
+
+make_pip_dependencies() {
+
+    set -euo pipefail;
+
+    local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
+    local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
+
+    local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
+    python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
+
+    local pip_noinstall=();
+    local pip_reqs_txts=();
+
+    eval "$(                                  \
+        rapids-list-repos "$@"                \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
+    local i;
+
+    for ((i=0; i < ${repos_length:-0}; i+=1)); do
+
+        local repo="repos_${i}";
+        local repo_name="${repo}_name";
+        local repo_path="${repo}_path";
+
+        pip_noinstall+=("lib${!repo_name}" "${!repo_name}");
+
+        if [ -f ~/"${!repo_path}/dependencies.yaml" ]; then
+            pip_reqs_txts+=("/tmp/${!repo_name}.requirements.txt");
+
+            echo "Generating ${!repo_name}'s requirements.txt" 1>&2;
+
+            rapids-dependency-file-generator                                          \
+                --file_key py_build_${!repo_name}                                     \
+                --file_key py_run_${!repo_name}                                       \
+                --file_key py_test_${!repo_name}                                      \
+                --file_key py_build                                                   \
+                --file_key py_run                                                     \
+                --file_key py_test                                                    \
+                --file_key all                                                        \
+                --output requirements                                                 \
+                --config ~/"${!repo_path}/dependencies.yaml"                          \
+                --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
+                `# --stdout` \
+          | grep -v '^#' \
+          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g" \
+          | sed -E "s/cuda-python[ ]+?>=.*\"/cuda-python>=${cuda_version_major}\"/" \
+          | sed -E "s/cupy-cuda[0-9]+x[ ]+?>=.*\"/cupy-cuda${cuda_version_major}x\"/g" \
+            > /tmp/${!repo_name}.requirements.txt;
+        fi
+    done
+
+    # add all python packages to the noinstall list.
+    for pkg in $(rapids-python-pkg-names) $(rapids-python-conda-pkg-names); do
+        pip_noinstall+=("${pkg}" "${pkg}-cu.*");
+        if test -z "${pkg##*"-"*}"; then
+            pip_noinstall+=("${pkg//"-"/"_"}" "${pkg//"-"/"_"}-cu.*")
+        fi
+        if test -z "${pkg##*"_"*}"; then
+            pip_noinstall+=("${pkg//"_"/"-"}" "${pkg//"_"/"-"}-cu.*")
+        fi
+    done
+
+    if test ${#pip_reqs_txts[@]} -gt 0; then
+        pip_noinstall=($(echo -n "${pip_noinstall[@]}" | xargs -r -n1 -d' ' | sort -su | tr '\n' ' '));
+        # Generate a combined requirements.txt file
+        cat ${pip_reqs_txts[@]} \
+          | grep -v -P "^($(rapids-join-strings "|" ${pip_noinstall[@]}))==.*$" \
+        ;
+
+        rm ${pip_reqs_txts[@]};
+    fi
+}
+
+make_pip_dependencies "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 964ff0956..d1579c4db 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -4,86 +4,27 @@ make_pip_env() {
 
     set -euo pipefail;
 
+    local force=;
     local env_name="${1}";
     local env_file_name="${env_name}.requirements.txt";
 
+    eval "$(                                  \
+        devcontainer-utils-parse-args --names '
+            f|force                           |
+        ' - <<< "${@:2}"                      \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
     # Remove the current virtual env if called with `-f|--force`
-    if echo "${@:2}" | grep -qE '(\-f|\-\-force)'; then
+    if test -n "${f:-${force:-}}"; then
         rm -rf "$HOME/.local/share/venvs/${env_name}" \
                "$HOME/.local/share/venvs/${env_file_name}";
     fi
 
-    local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
-    local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
-
-    local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
-    python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
-
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
-    local pip_noinstall=();
-    local pip_reqs_txts=();
-
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    local i;
-
-    for ((i=0; i < ${repos_length:-0}; i+=1)); do
-
-        local repo="repos_${i}";
-        local repo_name="${repo}_name";
-        local repo_path="${repo}_path";
-
-        pip_noinstall+=("lib${!repo_name}" "${!repo_name}");
-
-        if [ -f ~/"${!repo_path}/dependencies.yaml" ]; then
-            pip_reqs_txts+=("/tmp/${!repo_name}.requirements.txt");
-
-            echo "Generating ${!repo_name}'s requirements.txt" 1>&2;
-
-            rapids-dependency-file-generator                                          \
-                --file_key py_build_${!repo_name}                                     \
-                --file_key py_run_${!repo_name}                                       \
-                --file_key py_test_${!repo_name}                                      \
-                --file_key py_build                                                   \
-                --file_key py_run                                                     \
-                --file_key py_test                                                    \
-                --file_key all                                                        \
-                --output requirements                                                 \
-                --config ~/"${!repo_path}/dependencies.yaml"                          \
-                --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
-                `# --stdout` \
-          | grep -v '^#' \
-          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g" \
-            > /tmp/${!repo_name}.requirements.txt;
-        fi
-    done
-
-    # add all python packages to the noinstall list.
-    for pkg in $(rapids-python-pkg-names) $(rapids-python-conda-pkg-names); do
-        pip_noinstall+=("${pkg}" "${pkg}-cu.*");
-        if test -z "${pkg##*"-"*}"; then
-            pip_noinstall+=("${pkg//"-"/"_"}" "${pkg//"-"/"_"}-cu.*")
-        fi
-        if test -z "${pkg##*"_"*}"; then
-            pip_noinstall+=("${pkg//"_"/"-"}" "${pkg//"_"/"-"}-cu.*")
-        fi
-    done
-
-    if test ${#pip_reqs_txts[@]} -gt 0; then
-        pip_noinstall=($(echo -n "${pip_noinstall[@]}" | xargs -r -n1 -d' ' | sort -su | tr '\n' ' '));
-        # Generate a combined requirements.txt file
-        cat ${pip_reqs_txts[@]} \
-          | grep -v -P "^($(rapids-join-strings "|" ${pip_noinstall[@]}))==.*$" \
-        > "${new_env_path}";
-
-        rm ${pip_reqs_txts[@]};
-    fi
+    make-pip-dependencies > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 

From 8f7f8c65b8a0ca6fc9b66c038bae17c6cbc8ba1f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 9 Jan 2024 12:56:09 -0800
Subject: [PATCH 002/217] fix names

---
 .../opt/rapids-build-utils/bin/make-conda-env.sh                | 2 +-
 .../opt/rapids-build-utils/bin/make-pip-env.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 88c3453fd..f6f96e696 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -24,7 +24,7 @@ make_conda_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.conda/envs/${env_file_name})";
 
-    make-conda-dependencies > "${new_env_path}";
+    rapids-make-conda-dependencies > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index d1579c4db..ddc026d29 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -24,7 +24,7 @@ make_pip_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
-    make-pip-dependencies > "${new_env_path}";
+    rapids-make-pip-dependencies > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 

From 05203ca5ddc9e27e6e0f2a1bc1b6d98f658b6c4c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 10 Jan 2024 12:05:29 -0800
Subject: [PATCH 003/217] parse duplicated arguments into a list

---
 features/src/utils/devcontainer-feature.json  |  2 +-
 .../utils/opt/devcontainer/bin/parse-args.sh  | 26 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index effdbe217..f0f3fb3de 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.2.3",
+  "version": "24.2.4",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 4f0600ec3..ff260680d 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -87,7 +87,15 @@ parse_args() {
         if grep -qP "^${vars}$" <<< "${key}"; then
             key="${key//-/_}";
             keys+=("$key");
-            dict[$key]="$(printf %q "${val}")";
+            if test -v dict[$key]; then
+                dict[$key]+=" $(printf %q "${val}")";
+                if ! test -v __${key}_ary; then
+                    declare __${key}_ary;
+                    eval __${key}_ary="";
+                fi
+            else
+                dict[$key]="$(printf %q "${val}")";
+            fi
         else
             rest+=("${arg}");
         fi
@@ -96,17 +104,21 @@ parse_args() {
     keys+=("__rest__");
     dict["__rest__"]="(${rest[@]})";
 
-    keys=($(echo "${keys[@]}" | xargs -r -d' ' -n1 echo -e | sort -s | uniq));
+    keys=($(echo "${keys[@]}" | xargs -r -d' ' -n1 echo -e | sort -su));
 
     { set +x; } 2>/dev/null;
 
-    local keyi=1;
+    local keyi=0;
 
-    for ((keyi=1; keyi < ${#keys[@]}; keyi+=1)); do
-        echo "${keys[$keyi]}=${dict[${keys[$keyi]}]}";
+    for ((keyi=0; keyi < ${#keys[@]}; keyi+=1)); do
+        key=${keys[$keyi]};
+        val=${dict[$key]};
+        if ! test -v __${key}_ary; then
+            echo "${key}=${val}";
+        else
+            echo "${key}=(${val})";
+        fi
     done
-
-    echo "${keys[0]}=${dict[${keys[0]}]}";
 }
 
 if test -n "${devcontainer_utils_debug:-}"; then

From 0c6d3aa1b7351db55d53079a6740124e73375926 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 10 Jan 2024 12:07:06 -0800
Subject: [PATCH 004/217] support passing -k|--keys to
 rapids-make-{conda,pip}-dependencies

---
 .../bin/make-conda-dependencies.sh            | 46 ++++++++++++----
 .../rapids-build-utils/bin/make-conda-env.sh  |  6 +-
 .../bin/make-pip-dependencies.sh              | 55 ++++++++++++-------
 .../rapids-build-utils/bin/make-pip-env.sh    |  6 +-
 4 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 7c548e8fa..6911f5f8b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -4,6 +4,20 @@ make_conda_dependencies() {
 
     set -euo pipefail;
 
+    local keys=();
+
+    eval "$(                                  \
+        devcontainer-utils-parse-args --names '
+            k|keys                            |
+        ' - <<< "$@"                          \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
+    if test -v k; then keys=(${k[@]}); fi
+    if test ${#keys[@]} -eq 0; then
+        keys=(all);
+    fi
+
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
 
@@ -27,24 +41,32 @@ make_conda_dependencies() {
         local repo_path="${repo}_path";
 
         if [ -f ~/"${!repo_path}/dependencies.yaml" ]; then
-            conda_env_yamls+=("/tmp/${!repo_name}.yaml");
             conda_noinstall+=("$(rapids-python-conda-pkg-names --repo "${!repo_name}")");
+
             echo "Generating ${!repo_name}'s conda env yml" 1>&2;
-            /opt/conda/bin/rapids-dependency-file-generator \
-                --file_key all \
-                --output conda \
-                --config ~/"${!repo_path}/dependencies.yaml" \
-                --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
-            > /tmp/${!repo_name}.yaml;
+
+            local repo_keys=(${keys[@]} ${keys[@]/%/_${!repo_name}});
+            local keyi;
+
+            for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
+                if rapids-dependency-file-generator                                       \
+                    --file_key ${repo_keys[$keyi]}                                        \
+                    --output conda                                                        \
+                    --config ~/"${!repo_path}/dependencies.yaml"                          \
+                    --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
+                >> /tmp/${!repo_name}${keyi}.yaml 2>/dev/null; then
+                    conda_env_yamls+=("/tmp/${!repo_name}${keyi}.yaml");
+                fi
+            done
         fi
     done
 
     if test ${#conda_env_yamls[@]} -gt 0; then
 
         # Generate a combined conda env yaml file.
-        /opt/conda/bin/conda-merge ${conda_env_yamls[@]} \
-          | grep -v '^name:' \
-          | grep -v -P '^(.*?)\-(.*?)rapids-(.*?)$' \
+        conda-merge ${conda_env_yamls[@]}                             \
+          | grep -v '^name:'                                          \
+          | grep -v -P '^(.*?)\-(.*?)rapids-(.*?)$'                   \
           | grep -v -P '^(.*?)\-(.*?)(\.git\@[^(main|master)])(.*?)$' \
           | grep -v -P "^(.*?)\-(.*?)($(rapids-join-strings "|" ${conda_noinstall[@]}))(=.*|>.*|<.*)?$" \
           ;
@@ -53,4 +75,8 @@ make_conda_dependencies() {
     fi
 }
 
+if test -n "${rapids_build_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
 (make_conda_dependencies "$@");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index f6f96e696..4d5e53aa2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -24,7 +24,7 @@ make_conda_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.conda/envs/${env_file_name})";
 
-    rapids-make-conda-dependencies > "${new_env_path}";
+    rapids-make-conda-dependencies ${__rest__[@]} > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 
@@ -58,6 +58,10 @@ make_conda_env() {
     fi
 }
 
+if test -n "${rapids_build_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
 . /opt/conda/etc/profile.d/conda.sh;
 . /opt/conda/etc/profile.d/mamba.sh;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 145421c2f..5ede462f0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -4,6 +4,20 @@ make_pip_dependencies() {
 
     set -euo pipefail;
 
+    local keys=();
+
+    eval "$(                                  \
+        devcontainer-utils-parse-args --names '
+            k|keys                            |
+        ' - <<< "$@"                          \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
+    if test -v k; then keys=(${k[@]}); fi
+    if test ${#keys[@]} -eq 0; then
+        keys=(py_build py_run py_test all);
+    fi
+
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
     local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
@@ -34,28 +48,23 @@ make_pip_dependencies() {
 
             echo "Generating ${!repo_name}'s requirements.txt" 1>&2;
 
-            rapids-dependency-file-generator                                          \
-                --file_key py_build_${!repo_name}                                     \
-                --file_key py_run_${!repo_name}                                       \
-                --file_key py_test_${!repo_name}                                      \
-                --file_key py_build                                                   \
-                --file_key py_run                                                     \
-                --file_key py_test                                                    \
-                --file_key all                                                        \
-                --output requirements                                                 \
-                --config ~/"${!repo_path}/dependencies.yaml"                          \
-                --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
-                `# --stdout` \
-          | grep -v '^#' \
-          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g" \
-          | sed -E "s/cuda-python[ ]+?>=.*\"/cuda-python>=${cuda_version_major}\"/" \
-          | sed -E "s/cupy-cuda[0-9]+x[ ]+?>=.*\"/cupy-cuda${cuda_version_major}x\"/g" \
-            > /tmp/${!repo_name}.requirements.txt;
+            local repo_keys=(${keys[@]} ${keys[@]/%/_${!repo_name}});
+            local keyi;
+
+            for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
+                rapids-dependency-file-generator                                          \
+                    --file_key ${repo_keys[$keyi]}                                        \
+                    --output requirements                                                 \
+                    --config ~/"${!repo_path}/dependencies.yaml"                          \
+                    --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
+                    `# --stdout` \
+                >> /tmp/${!repo_name}.requirements.txt 2>/dev/null || true;
+            done
         fi
     done
 
     # add all python packages to the noinstall list.
-    for pkg in $(rapids-python-pkg-names) $(rapids-python-conda-pkg-names); do
+    for pkg in $(rapids-python-pkg-names); do
         pip_noinstall+=("${pkg}" "${pkg}-cu.*");
         if test -z "${pkg##*"-"*}"; then
             pip_noinstall+=("${pkg//"-"/"_"}" "${pkg//"-"/"_"}-cu.*")
@@ -69,11 +78,19 @@ make_pip_dependencies() {
         pip_noinstall=($(echo -n "${pip_noinstall[@]}" | xargs -r -n1 -d' ' | sort -su | tr '\n' ' '));
         # Generate a combined requirements.txt file
         cat ${pip_reqs_txts[@]} \
-          | grep -v -P "^($(rapids-join-strings "|" ${pip_noinstall[@]}))==.*$" \
+          | grep -v '^#' \
+          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g" \
+          | sed -E "s/cupy-cuda[0-9]+x[ ]+?>=.*/cupy-cuda${cuda_version_major}x>=${cuda_version_major}/g" \
+          | sed -E "s/cuda-python[ ]+?>=.*/cuda-python>=${cuda_version_major},<$((cuda_version_major+1)).0a0/g" \
+          | grep -v -P "^($(rapids-join-strings "|" ${pip_noinstall[@]}))" \
         ;
 
         rm ${pip_reqs_txts[@]};
     fi
 }
 
+if test -n "${rapids_build_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
 make_pip_dependencies "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index ddc026d29..c71d244d4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -24,7 +24,7 @@ make_pip_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
-    rapids-make-pip-dependencies > "${new_env_path}";
+    rapids-make-pip-dependencies ${__rest__[@]} > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 
@@ -62,6 +62,10 @@ make_pip_env() {
     fi
 }
 
+if test -n "${rapids_build_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
 (make_pip_env "${DEFAULT_VIRTUAL_ENV:-rapids}" "$@");
 
 if test -f ~/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate; then

From b09ac4c2902669d8238b5ef8efd4eb2f36338b1d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 11 Jan 2024 11:03:21 -0800
Subject: [PATCH 005/217] fix cugraph-service-{client,server} paths

---
 .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index ae5e652b5..405028dda 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -172,10 +172,10 @@ repos:
       sub_dir: python/cugraph-pyg
       depends: [cugraph]
     - name: cugraph-service-client
-      sub_dir: python/cugraph-service/server
+      sub_dir: python/cugraph-service/client
       depends: []
     - name: cugraph-service-server
-      sub_dir: python/cugraph-service/client
+      sub_dir: python/cugraph-service/server
       depends: [cudf, dask-cudf, cugraph, cugraph-service-client]
   git:
     repo: cugraph

From 35f65d808474b6e0266f9298b920485cdc5180b0 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 11 Jan 2024 11:53:46 -0800
Subject: [PATCH 006/217] escape rest parameters

---
 features/src/utils/opt/devcontainer/bin/parse-args.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index ff260680d..f04106a48 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -37,7 +37,7 @@ parse_args() {
         # --
         elif grep -qP '^--$' <<< "${arg:-}"; then
             shift;
-            rest+=("${@}");
+            rest+=("${@@Q}");
             break;
         # -foo=bar | --foo=bar
         elif grep -qP '^--?[^\s]+=.*$' <<< "${arg:-}"; then
@@ -80,7 +80,7 @@ parse_args() {
                 fi
             fi
         else
-            rest+=("${@}");
+            rest+=("${@@Q}");
             break;
         fi
 
@@ -88,13 +88,13 @@ parse_args() {
             key="${key//-/_}";
             keys+=("$key");
             if test -v dict[$key]; then
-                dict[$key]+=" $(printf %q "${val}")";
+                dict[$key]+=" ${val@Q}";
                 if ! test -v __${key}_ary; then
                     declare __${key}_ary;
                     eval __${key}_ary="";
                 fi
             else
-                dict[$key]="$(printf %q "${val}")";
+                dict[$key]="${val@Q}";
             fi
         else
             rest+=("${arg}");

From c55e011fc5539056c1ef285b4103f3bddc614063 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 11 Jan 2024 11:54:14 -0800
Subject: [PATCH 007/217] support python cmake, wheel, and install args in
 manifest.yaml

---
 .../bin/generate-scripts.sh                   | 41 +++++-----
 .../bin/tmpl/python-build-editable.tmpl.sh    | 47 +++++++++---
 .../bin/tmpl/python-build-wheel.tmpl.sh       | 74 ++++++++++++++-----
 3 files changed, 112 insertions(+), 50 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index b19f79994..580b2e0e4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -30,7 +30,10 @@ generate_script() {
                   $GIT_TAG
                   $GIT_REPO
                   $GIT_HOST
-                  $GIT_UPSTREAM' \
+                  $GIT_UPSTREAM
+                  $PY_CMAKE_ARGS
+                  $PIP_WHEEL_ARGS
+                  $PIP_INSTALL_ARGS' \
       | sudo tee "$TMP_SCRIPT_DIR/${bin}" >/dev/null;
 
         sudo chmod +x "$TMP_SCRIPT_DIR/${bin}";
@@ -133,7 +136,7 @@ generate_scripts() {
     local j;
     local k;
 
-    local repo_name_all=()
+    local repo_names=();
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
@@ -149,7 +152,7 @@ generate_scripts() {
 
         repo_name="$(tr "[:upper:]" "[:lower:]" <<< "${!repo_name:-}")";
 
-        repo_name_all+=($repo_name)
+        repo_names+=($repo_name)
 
         # Generate a clone script for each repo
         (
@@ -228,26 +231,26 @@ generate_scripts() {
 
             for ((j=0; j < ${!py_length:-0}; j+=1)); do
                 local py_name="${repo}_python_${j}_name";
-                local py_args="${repo}_python_${j}_args";
+                local py_cmake_args="${repo}_python_${j}_args_cmake";
+                local pip_wheel_args="${repo}_python_${j}_args_wheel";
+                local pip_install_args="${repo}_python_${j}_args_install";
                 local py_sub_dir="${repo}_python_${j}_sub_dir";
                 local py_depends_length="${repo}_python_${j}_depends_length";
                 local py_path="${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
 
-                py_libs+=(${!py_name})
-                py_dirs+=($py_path)
-            done;
+                py_libs+=(${!py_name});
 
-            for ((k=0; k < ${#py_libs[@]}; k+=1)); do
-                local py_dir="${py_dirs[$k]}";
-                local py_lib="${py_libs[$k]}";
                 (
-                    PY_SRC="${py_dir}"     \
-                    PY_LIB="${py_lib}"     \
-                    CPP_ARGS="${args[@]}"  \
-                    CPP_DEPS="${deps[@]}"  \
-                    generate_python_scripts;
+                    PY_SRC="${py_path}"                       \
+                    PY_LIB="${!py_name}"                      \
+                    CPP_ARGS="${args[@]}"                     \
+                    CPP_DEPS="${deps[@]}"                     \
+                    PY_CMAKE_ARGS="${!py_cmake_args:-}"       \
+                    PIP_WHEEL_ARGS="${!pip_wheel_args:-}"     \
+                    PIP_INSTALL_ARGS="${!pip_install_args:-}" \
+                    generate_python_scripts                   ;
                 ) || true;
-            done
+            done;
 
             for ((k=0; k < ${#cpp_libs[@]}; k+=1)); do
                 cpp_libs[$k]="$(tr "[:upper:]" "[:lower:]" <<< "${cpp_libs[$k]}")";
@@ -271,9 +274,9 @@ generate_scripts() {
     for script in "clone" "clean" "configure" "build"; do
         # Generate a script to run a script for all repos
         (
-            NAMES="${repo_name_all[@]}"       \
-            SCRIPT="${script}"                \
-            generate_all_script               ;
+            NAMES="${repo_names[@]}" \
+            SCRIPT="${script}"       \
+            generate_all_script      ;
         ) || true;
     done;
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
index c8f9d71e5..8f74c15fc 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
@@ -4,27 +4,42 @@ build_${PY_LIB}_python_inplace() {
 
     set -euo pipefail;
 
-    if [[ ! -d ~/${PY_SRC} ]]; then
+    if [[ ! -d ~/"${PY_SRC}" ]]; then
         exit 1;
     fi
 
-    local verbose="";
+    local archs="";
     local parallel="";
+    local max_device_obj_memory_usage="";
+
+    local verbose="";
 
     eval "$(                                  \
         devcontainer-utils-parse-args --names '
             a|archs                           |
             j|parallel                        |
-            v|verbose                         |
             m|max-device-obj-memory-usage     |
+            v|verbose                         |
         ' - <<< "$@"                          \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
     verbose="${v:-${verbose:-}}";
-    parallel="${j:-${parallel:-${JOBS:-${PARALLEL_LEVEL:-$(nproc --ignore=2)}}}}";
+    config_settings="${C:-${config_settings:-}}";
+
+    archs="${a:-${archs:-}}";
+    parallel="${j:-${parallel:-}}";
+    max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-}}";
+
+    eval "$(                                                                    \
+        rapids-get-num-archs-jobs-and-load                                      \
+            ${archs:+-a ${archs}}                                               \
+            ${parallel:+-j ${parallel}}                                         \
+            ${max_device_obj_memory_usage:+-m ${max_device_obj_memory_usage}}   \
+      | xargs -r -d'\n' -I% echo -n local %\;                                   \
+    )";
 
-    local cmake_args=();
+    local cmake_args=(${PY_CMAKE_ARGS});
 
     if test -n "${verbose}"; then
         cmake_args+=("--log-level=VERBOSE");
@@ -39,29 +54,39 @@ build_${PY_LIB}_python_inplace() {
     if test -n "${verbose}"; then
         ninja_args+=("-v");
     fi
-    if test -n "${parallel}"; then
-        if [ "${parallel:-}" = "true" ]; then
-            parallel="";
-        fi
-        ninja_args+=("-j${parallel}");
+
+    if test -n "${n_jobs}"; then
+        ninja_args+=("-j${n_jobs}");
+    fi
+
+    if test -n "${n_load}"; then
+        ninja_args+=("-l${n_load}");
     fi
 
-    local pip_args=();
+    local pip_args=(${PIP_INSTALL_ARGS});
+
     if test -n "${verbose}"; then
         pip_args+=("-vv");
     fi
+
     pip_args+=("--no-build-isolation");
     pip_args+=("--no-deps");
     pip_args+=("--editable");
     pip_args+=(~/"${PY_SRC}");
+
     cmake_args+=("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON");
 
     trap "rm -rf ~/'${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
 
+    local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
+    local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
+
     time                                         \
+    CUDAFLAGS="${cudaflags}"                     \
     CMAKE_GENERATOR="Ninja"                      \
     CMAKE_ARGS="${cmake_args[@]}"                \
     SKBUILD_BUILD_OPTIONS="${ninja_args[@]}"     \
+    NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
     SETUPTOOLS_ENABLE_FEATURES="legacy-editable" \
         python -m pip install ${pip_args[@]}     \
     ;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
index bf31b45c7..c1f9b8144 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
@@ -4,36 +4,52 @@ build_${PY_LIB}_python_wheel() {
 
     set -euo pipefail;
 
-    if [[ ! -d ~/${PY_SRC} ]]; then
+    if [[ ! -d ~/"${PY_SRC}" ]]; then
         exit 1;
     fi
 
-    local verbose="";
+    local archs="";
     local parallel="";
+    local max_device_obj_memory_usage="";
+
+    local verbose="";
     local wheel_dir="";
 
     eval "$(                                  \
         devcontainer-utils-parse-args --names '
             a|archs                           |
             j|parallel                        |
-            v|verbose                         |
             m|max-device-obj-memory-usage     |
+            v|verbose                         |
             w|wheel-dir                       |
             prefer-binary                     |
             only-binary                       |
-            no-verify                         |
-            no-build-isolation                |
             no-deps                           |
+            no-clean                          |
+            no-verify                         |
+            no-cache-dir                      |
             no-use-pep517                     |
+            no-build-isolation                |
         ' - <<< "$@"                          \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
     verbose="${v:-${verbose:-}}";
     wheel_dir="${w:-${wheel_dir:-}}";
-    parallel="${j:-${parallel:-${JOBS:-${PARALLEL_LEVEL:-$(nproc --ignore=2)}}}}";
 
-    local cmake_args=();
+    archs="${a:-${archs:-}}";
+    parallel="${j:-${parallel:-}}";
+    max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-}}";
+
+    eval "$(                                                                    \
+        rapids-get-num-archs-jobs-and-load                                      \
+            ${archs:+-a ${archs}}                                               \
+            ${parallel:+-j ${parallel}}                                         \
+            ${max_device_obj_memory_usage:+-m ${max_device_obj_memory_usage}}   \
+      | xargs -r -d'\n' -I% echo -n local %\;                                   \
+    )";
+
+    local cmake_args=(${PY_CMAKE_ARGS});
 
     if test -n "${verbose}"; then
         cmake_args+=("--log-level=VERBOSE");
@@ -45,27 +61,23 @@ build_${PY_LIB}_python_wheel() {
     cmake_args+=(${__rest__[@]});
 
     local ninja_args=();
+
     if test -n "${verbose}"; then
         ninja_args+=("-v");
     fi
-    if test -n "${parallel}"; then
-        if [ "${parallel:-}" = "true" ]; then
-            parallel="";
-        fi
-        ninja_args+=("-j${parallel}");
-    fi
 
-    local pip_args=();
-    if test -n "${verbose}"; then
-        pip_args+=("-vv");
+    if test -n "${n_jobs}"; then
+        ninja_args+=("-j${n_jobs}");
     fi
 
-    if test -n "${no_build_isolation:-}"; then
-        pip_args+=("--no-build-isolation");
+    if test -n "${n_load}"; then
+        ninja_args+=("-l${n_load}");
     fi
 
-    if test -n "${no_deps:-}"; then
-        pip_args+=("--no-deps");
+    local pip_args=(${PIP_WHEEL_ARGS});
+
+    if test -n "${verbose}"; then
+        pip_args+=("-vv");
     fi
 
     if test -n "${wheel_dir:-}"; then
@@ -86,22 +98,44 @@ build_${PY_LIB}_python_wheel() {
         fi
     fi
 
+    if test -n "${no_deps:-}"; then
+        pip_args+=("--no-deps");
+    fi
+
+    if test -n "${no_clean:-}"; then
+        pip_args+=("--no-clean");
+    fi
+
     if test -n "${no_verify:-}"; then
         pip_args+=("--no-verify");
     fi
 
+    if test -n "${no_cache_dir:-}"; then
+        pip_args+=("--no-cache-dir");
+    fi
+
     if test -n "${no_use_pep517:-}"; then
         pip_args+=("--no-use-pep517");
     fi
 
+    if test -n "${no_build_isolation:-}"; then
+        pip_args+=("--no-build-isolation");
+    fi
+
     pip_args+=(~/"${PY_SRC}");
 
     trap "rm -rf ~/'${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
 
+    local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
+    local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
+
     time                                     \
+    CUDAFLAGS="${cudaflags}"                 \
     CMAKE_GENERATOR="Ninja"                  \
+    PARALLEL_LEVEL="${n_jobs}"               \
     CMAKE_ARGS="${cmake_args[@]}"            \
     SKBUILD_BUILD_OPTIONS="${ninja_args[@]}" \
+    NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
         python -m pip wheel ${pip_args[@]}   \
     ;
 }

From ddefcce075962140506fd3887136035205ed4f6c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 11 Jan 2024 12:25:23 -0800
Subject: [PATCH 008/217] generate dependencies per python lib + file_key

---
 .../bin/make-conda-dependencies.sh            | 52 ++++++------
 .../bin/make-pip-dependencies.sh              | 80 +++++++++++--------
 2 files changed, 73 insertions(+), 59 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 6911f5f8b..edf05a2d2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -24,11 +24,10 @@ make_conda_dependencies() {
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
 
-    local conda_noinstall=();
     local conda_env_yamls=();
 
     eval "$(                                  \
-        rapids-list-repos "$@"                \
+        rapids-list-repos ${__rest__[@]}      \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
@@ -41,34 +40,39 @@ make_conda_dependencies() {
         local repo_path="${repo}_path";
 
         if [ -f ~/"${!repo_path}/dependencies.yaml" ]; then
-            conda_noinstall+=("$(rapids-python-conda-pkg-names --repo "${!repo_name}")");
-
-            echo "Generating ${!repo_name}'s conda env yml" 1>&2;
-
-            local repo_keys=(${keys[@]} ${keys[@]/%/_${!repo_name}});
-            local keyi;
-
-            for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
-                if rapids-dependency-file-generator                                       \
-                    --file_key ${repo_keys[$keyi]}                                        \
-                    --output conda                                                        \
-                    --config ~/"${!repo_path}/dependencies.yaml"                          \
-                    --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
-                >> /tmp/${!repo_name}${keyi}.yaml 2>/dev/null; then
-                    conda_env_yamls+=("/tmp/${!repo_name}${keyi}.yaml");
-                fi
+
+            local py_length="${repo}_python_length";
+
+            for ((j=0; j < ${!py_length:-0}; j+=1)); do
+                local py_name="${repo}_python_${j}_name";
+
+                echo "Generating ${!py_name}'s conda env yml" 1>&2;
+
+                local repo_keys=(${keys[@]} ${keys[@]/%/_${!py_name//"-"/"_"}});
+                local keyi;
+
+                for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
+                    if rapids-dependency-file-generator                                       \
+                        --file_key ${repo_keys[$keyi]}                                        \
+                        --output conda                                                        \
+                        --config ~/"${!repo_path}/dependencies.yaml"                          \
+                        --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
+                        `# --stdout` \
+                    >> /tmp/${!repo_name}.${!py_name}.${keyi}.env.yaml 2>/dev/null; then
+                        conda_env_yamls+=("/tmp/${!repo_name}.${!py_name}.${keyi}.env.yaml");
+                    fi
+                done
             done
         fi
     done
 
     if test ${#conda_env_yamls[@]} -gt 0; then
-
+        local conda_noinstall=($(rapids-python-pkg-names) $(rapids-python-conda-pkg-names));
         # Generate a combined conda env yaml file.
-        conda-merge ${conda_env_yamls[@]}                             \
-          | grep -v '^name:'                                          \
-          | grep -v -P '^(.*?)\-(.*?)rapids-(.*?)$'                   \
-          | grep -v -P '^(.*?)\-(.*?)(\.git\@[^(main|master)])(.*?)$' \
-          | grep -v -P "^(.*?)\-(.*?)($(rapids-join-strings "|" ${conda_noinstall[@]}))(=.*|>.*|<.*)?$" \
+        conda-merge ${conda_env_yamls[@]}                                                                \
+          | grep -v '^name:'                                                                             \
+          | grep -v -P '^[ ]*?\- (\.git\@[^(main|master)])(.*?)$'                                        \
+          | grep -v -P "^[ ]*?\- ($(tr -d '[:blank:]' <<< "${conda_noinstall[@]/%/ |}"))(=.*|>.*|<.*)?$" \
           ;
 
         rm ${conda_env_yamls[@]};
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 5ede462f0..dedeef342 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -19,17 +19,20 @@ make_pip_dependencies() {
     fi
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]*.[0-9]' <<< "${cuda_version}")";
     local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
+    local cuda_version_minor="$(cut -d'.' -f2 <<< "${cuda_version}")";
+    local cuda_version_patch="$(cut -d'.' -f3 <<< "${cuda_version}")";
+    local cuda_version_mm="${cuda_version_major}.${cuda_version_minor:-0}";
+    cuda_version="${cuda_version_mm}.${cuda_version_patch:-0}";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
 
-    local pip_noinstall=();
     local pip_reqs_txts=();
 
     eval "$(                                  \
-        rapids-list-repos "$@"                \
+        rapids-list-repos ${__rest__[@]}      \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
@@ -41,48 +44,55 @@ make_pip_dependencies() {
         local repo_name="${repo}_name";
         local repo_path="${repo}_path";
 
-        pip_noinstall+=("lib${!repo_name}" "${!repo_name}");
-
         if [ -f ~/"${!repo_path}/dependencies.yaml" ]; then
-            pip_reqs_txts+=("/tmp/${!repo_name}.requirements.txt");
 
-            echo "Generating ${!repo_name}'s requirements.txt" 1>&2;
+            local py_length="${repo}_python_length";
 
-            local repo_keys=(${keys[@]} ${keys[@]/%/_${!repo_name}});
-            local keyi;
+            for ((j=0; j < ${!py_length:-0}; j+=1)); do
+                local py_name="${repo}_python_${j}_name";
 
-            for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
-                rapids-dependency-file-generator                                          \
-                    --file_key ${repo_keys[$keyi]}                                        \
-                    --output requirements                                                 \
-                    --config ~/"${!repo_path}/dependencies.yaml"                          \
-                    --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
-                    `# --stdout` \
-                >> /tmp/${!repo_name}.requirements.txt 2>/dev/null || true;
-            done
-        fi
-    done
+                echo "Generating ${!py_name}'s requirements.txt" 1>&2;
 
-    # add all python packages to the noinstall list.
-    for pkg in $(rapids-python-pkg-names); do
-        pip_noinstall+=("${pkg}" "${pkg}-cu.*");
-        if test -z "${pkg##*"-"*}"; then
-            pip_noinstall+=("${pkg//"-"/"_"}" "${pkg//"-"/"_"}-cu.*")
-        fi
-        if test -z "${pkg##*"_"*}"; then
-            pip_noinstall+=("${pkg//"_"/"-"}" "${pkg//"_"/"-"}-cu.*")
+                local repo_keys=(${keys[@]} ${keys[@]/%/_${!py_name//"-"/"_"}});
+                local keyi;
+
+                for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
+                    if rapids-dependency-file-generator                                          \
+                        --file_key ${repo_keys[$keyi]}                                           \
+                        --output requirements                                                    \
+                        --config ~/"${!repo_path}/dependencies.yaml"                             \
+                        --matrix "arch=$(uname -m);cuda=${cuda_version_mm};py=${python_version}" \
+                        `# --stdout` \
+                    >> /tmp/${!repo_name}.${!py_name}.${keyi}.requirements.txt 2>/dev/null; then
+                        pip_reqs_txts+=("/tmp/${!repo_name}.${!py_name}.${keyi}.requirements.txt");
+                    fi
+                done
+            done
         fi
     done
 
     if test ${#pip_reqs_txts[@]} -gt 0; then
-        pip_noinstall=($(echo -n "${pip_noinstall[@]}" | xargs -r -n1 -d' ' | sort -su | tr '\n' ' '));
+
+        local pip_noinstall=();
+
+        # add all python packages to the noinstall list.
+        for pkg in $(rapids-python-pkg-names); do
+            pip_noinstall+=("${pkg}" "${pkg}-cu.*");
+            if test -z "${pkg##*"-"*}"; then
+                pip_noinstall+=("${pkg//"-"/"_"}" "${pkg//"-"/"_"}-cu.*")
+            fi
+            if test -z "${pkg##*"_"*}"; then
+                pip_noinstall+=("${pkg//"_"/"-"}" "${pkg//"_"/"-"}-cu.*")
+            fi
+        done
+
         # Generate a combined requirements.txt file
-        cat ${pip_reqs_txts[@]} \
-          | grep -v '^#' \
-          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g" \
-          | sed -E "s/cupy-cuda[0-9]+x[ ]+?>=.*/cupy-cuda${cuda_version_major}x>=${cuda_version_major}/g" \
-          | sed -E "s/cuda-python[ ]+?>=.*/cuda-python>=${cuda_version_major},<$((cuda_version_major+1)).0a0/g" \
-          | grep -v -P "^($(rapids-join-strings "|" ${pip_noinstall[@]}))" \
+        cat ${pip_reqs_txts[@]}                                                                           \
+          | grep -v '^#'                                                                                  \
+          | grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$"             \
+          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                             \
+          | sed -E "s/cupy-cuda[0-9]+x[ ]+?>=.*/cupy-cuda${cuda_version_major}x>=${cuda_version}/g"       \
+          | sed -E "s/cuda-python[ ]+?>=.*/cuda-python>=${cuda_version},<$((cuda_version_major+1)).0a0/g" \
         ;
 
         rm ${pip_reqs_txts[@]};

From 6bfea463b973dbfebf063db3abe7a00a3bfb6eb9 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 11 Jan 2024 12:26:02 -0800
Subject: [PATCH 009/217] add query-manifest command

---
 features/src/rapids-build-utils/install.sh    |  1 +
 .../opt/rapids-build-utils/bin/list-repos.sh  | 27 ++--------
 .../rapids-build-utils/bin/query-manifest.sh  | 49 +++++++++++++++++++
 3 files changed, 53 insertions(+), 24 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index d3b0ef70b..556b092ec 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -53,6 +53,7 @@ update-alternatives --install /usr/bin/rapids-python-pkg-names              rapi
 update-alternatives --install /usr/bin/rapids-python-conda-pkg-names        rapids-python-conda-pkg-names       /opt/rapids-build-utils/bin/python-conda-pkg-names.sh       0;
 update-alternatives --install /usr/bin/rapids-get-num-archs-jobs-and-load   rapids-get-num-archs-jobs-and-load  /opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh  0;
 update-alternatives --install /usr/bin/rapids-list-repos                    rapids-list-repos                   /opt/rapids-build-utils/bin/list-repos.sh                   0;
+update-alternatives --install /usr/bin/rapids-query-manifest                rapids-query-manifest               /opt/rapids-build-utils/bin/query-manifest.sh               0;
 
 find /opt/rapids-build-utils \
     \( -type d -exec chmod 0775 {} \; \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 0a7340aa9..2703f1113 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -4,49 +4,28 @@ list_repos() {
     set -euo pipefail;
 
     local repo=;
-    local manifest=;
 
     eval "$(                                  \
         devcontainer-utils-parse-args --names '
             r|repo                            |
-            m|manifest                        |
         ' - <<< "$@"                          \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
     repo="${r:-${repo:-}}";
-    manifest="${m:-${manifest:-"${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}"}}";
-
-    local query=;
-
-    query="$(cat <<"________EOF" | tr -s '[:space:]'
-        [
-          paths(arrays) as $path | {
-            "key": ($path + ["length"]) | join("_"),
-            "val": getpath($path) | length
-          }
-        ] + [
-          paths(scalars) as $path | {
-            "key": $path | join("_"),
-            "val": getpath($path)
-          }
-        ]
-        | map(select(.key | startswith("repos")))
-        | map(.key + "=" + (.val | @sh | gsub("[\\n]"; " ")))[]
-________EOF
-)";
+
+    local query=".repos | {repos: .}";
 
     if test -n "${repo:-}"; then
         query="$(cat <<________EOF | tr -s '[:space:]'
         .repos
         | map(select(.name == "${repo}"))
         | {repos: .}
-        | ${query}
 ________EOF
 )";
     fi
 
-    yq -Mo json "${manifest}" | jq -r "${query}";
+    rapids-query-manifest ${__rest__[@]} "${query}";
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
new file mode 100755
index 000000000..e3cb0aabb
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -0,0 +1,49 @@
+#! /usr/bin/env bash
+
+query_manifest() {
+    set -euo pipefail;
+
+    local manifest=;
+
+    eval "$(                                  \
+        devcontainer-utils-parse-args --names '
+            m|manifest                        |
+        ' - <<< "${@@Q}"                      \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
+    manifest="${m:-${manifest:-"${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}"}}";
+
+    local query=;
+
+    query="$(cat <<"________EOF" | tr -s '[:space:]'
+        [
+          paths(arrays) as $path | {
+            "key": ($path + ["length"]) | join("_"),
+            "val": getpath($path) | length
+          }
+        ] + [
+          paths(scalars) as $path | {
+            "key": $path | join("_"),
+            "val": getpath($path)
+          }
+        ]
+        | map(select(.key))
+        | map(.key + "=" + (.val | @sh | gsub("[\\n]"; " ")))[]
+________EOF
+)";
+
+    query="$(cat <<________EOF | tr -s '[:space:]'
+        ${__rest__[@]}
+        | ${query}
+________EOF
+)";
+
+    yq -Mo json "${manifest}" | jq -r "${query}";
+}
+
+if test -n "${rapids_build_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+(query_manifest "$@");

From 907dbc2be3aeb1ce4e9d716f2ab75471afb10b03 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 11 Jan 2024 12:29:13 -0800
Subject: [PATCH 010/217] cleanup

---
 .../bin/tmpl/cpp-build.tmpl.sh                | 14 +++-----
 .../bin/tmpl/cpp-clean.tmpl.sh                |  2 +-
 .../bin/tmpl/cpp-configure.tmpl.sh            | 32 +++++++++++--------
 .../bin/tmpl/python-build-editable.tmpl.sh    |  5 +--
 .../bin/tmpl/python-build-wheel.tmpl.sh       |  1 +
 5 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
index 545844fa4..2259c6acf 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
@@ -4,7 +4,7 @@ build_${CPP_LIB}_cpp() {
 
     set -euo pipefail;
 
-    if [[ ! -d ~/${CPP_SRC} ]]; then
+    if [[ ! -d ~/"${CPP_SRC}" ]]; then
         exit 1;
     fi
 
@@ -19,23 +19,19 @@ build_${CPP_LIB}_cpp() {
 
     verbose="${v:-${verbose:-}}";
 
-    if test -n "${verbose}"; then verbose="--log-level=VERBOSE"; fi
-
-    configure-${CPP_LIB}-cpp ${verbose} ${__rest__[@]};
+    configure-${CPP_LIB}-cpp ${verbose:+-v} ${__rest__[@]};
 
     eval "$(                                              \
         rapids-get-num-archs-jobs-and-load ${__rest__[@]} \
       | xargs -r -d'\n' -I% echo -n local %\;             \
     )";
 
-    if test -n "${verbose}"; then verbose="--verbose"; fi
-
     time cmake                              \
-        --build ~/${CPP_SRC}/build/latest   \
-        ${verbose}                          \
+        --build ~/"${CPP_SRC}/build/latest" \
+        ${verbose:+--verbose}               \
         -j${n_jobs}                         \
         --                                  \
-        -l${n_load};
+        -l${n_load}                         ;
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
index 131bae46c..2da0ab849 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
@@ -4,7 +4,7 @@ clean_${CPP_LIB}_cpp() {
 
     set -euo pipefail;
 
-    rm -rf ~/${CPP_SRC}/build/latest/*;
+    rm -rf ~/"${CPP_SRC}/build/latest"/*;
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
index 5fd1082cf..7ca18fb9a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
@@ -4,7 +4,7 @@ configure_${CPP_LIB}_cpp() {
 
     set -euo pipefail;
 
-    if [[ ! -d ~/${CPP_SRC} ]]; then
+    if [[ ! -d ~/"${CPP_SRC}" ]]; then
         exit 1;
     fi
 
@@ -12,24 +12,35 @@ configure_${CPP_LIB}_cpp() {
     local parallel="";
     local max_device_obj_memory_usage="";
 
+    local verbose="";
+
     eval "$(                                  \
         devcontainer-utils-parse-args --names '
             a|archs                           |
             j|parallel                        |
             m|max-device-obj-memory-usage     |
+            v|verbose                         |
         ' - <<< "$@"                          \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
+    verbose="${v:-${verbose:-}}";
+
     archs="${a:-${archs:-}}";
-    archs="${a:-${archs:+-a${archs}}}";
-    parallel="${j:-${parallel:+-j${parallel}}}";
+    parallel="${j:-${parallel:-}}";
     max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-}}";
-    max_device_obj_memory_usage="${max_device_obj_memory_usage:+-m${max_device_obj_memory_usage}}";
+
+    eval "$(                                                                    \
+        rapids-get-num-archs-jobs-and-load                                      \
+            ${archs:+-a ${archs}}                                               \
+            ${parallel:+-j ${parallel}}                                         \
+            ${max_device_obj_memory_usage:+-m ${max_device_obj_memory_usage}}   \
+      | xargs -r -d'\n' -I% echo -n local %\;                                   \
+    )";
 
     local build_type="$(rapids-parse-cmake-build-type ${__rest__[@]} | tr '[:upper:]' '[:lower:]')";
-    local binary_dir=~/${CPP_SRC}/build/${build_type};
-    local source_dir=~/${CPP_SRC};
+    local binary_dir=~/"${CPP_SRC}/build/${build_type}";
+    local source_dir=~/"${CPP_SRC}";
 
     # Reconfigure if previous configure failed
     if [[ ! -f ${binary_dir}/build.ninja ]]; then
@@ -45,16 +56,9 @@ configure_${CPP_LIB}_cpp() {
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});
+    cmake_args+=(${verbose:+--log-level=VERBOSE});
     cmake_args+=(${__rest__[@]});
 
-    eval "$(                                    \
-        rapids-get-num-archs-jobs-and-load      \
-            ${archs}                            \
-            ${parallel}                         \
-            ${max_device_obj_memory_usage}      \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
-    )";
-
     time CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
          cmake ${cmake_args[@]};
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
index 8f74c15fc..478c639ef 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
@@ -41,13 +41,10 @@ build_${PY_LIB}_python_inplace() {
 
     local cmake_args=(${PY_CMAKE_ARGS});
 
-    if test -n "${verbose}"; then
-        cmake_args+=("--log-level=VERBOSE");
-    fi
-
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});
+    cmake_args+=(${verbose:+--log-level=VERBOSE});
     cmake_args+=(${__rest__[@]});
 
     local ninja_args=();
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
index c1f9b8144..8aa35bac0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
@@ -58,6 +58,7 @@ build_${PY_LIB}_python_wheel() {
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});
+    cmake_args+=(${verbose:+--log-level=VERBOSE});
     cmake_args+=(${__rest__[@]});
 
     local ninja_args=();

From 8e163090c7521a6b9a7946a718ac7deaa1d6ff92 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 11:27:00 -0800
Subject: [PATCH 011/217] sort and dedupe pip dependencies

---
 .../opt/rapids-build-utils/bin/make-pip-env.sh                | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index c71d244d4..5f9d31125 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -24,7 +24,9 @@ make_pip_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
-    rapids-make-pip-dependencies ${__rest__[@]} > "${new_env_path}";
+    rapids-make-pip-dependencies ${__rest__[@]}            \
+  | grep -v -e '^$' | tr -s "[:blank:]" | LC_ALL=C sort -u \
+  > "${new_env_path}"
 
     if test -f "${new_env_path}"; then
 

From b4469d7f37d744a8cc9b5d5acda8460ff5dfdf57 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 11:40:45 -0800
Subject: [PATCH 012/217] constrain cuda-python and cupy versions to the
 current CUDA version

---
 .../rapids-build-utils/bin/make-pip-dependencies.sh  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index dedeef342..168156847 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -87,12 +87,12 @@ make_pip_dependencies() {
         done
 
         # Generate a combined requirements.txt file
-        cat ${pip_reqs_txts[@]}                                                                           \
-          | grep -v '^#'                                                                                  \
-          | grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$"             \
-          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                             \
-          | sed -E "s/cupy-cuda[0-9]+x[ ]+?>=.*/cupy-cuda${cuda_version_major}x>=${cuda_version}/g"       \
-          | sed -E "s/cuda-python[ ]+?>=.*/cuda-python>=${cuda_version},<$((cuda_version_major+1)).0a0/g" \
+        cat ${pip_reqs_txts[@]}                                                                                   \
+          | grep -v '^#'                                                                                          \
+          | grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$"                     \
+          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                     \
+          | sed -E "s/cuda-python.*/cuda-python>=${cuda_version},<$((cuda_version_major+1)).0a0/g"                \
+          | sed -E "s/cupy-cuda[0-9]+x(==|>=|<=|>|<)?.*/cupy-cuda${cuda_version_major}x\1${cuda_version_major}/g" \
         ;
 
         rm ${pip_reqs_txts[@]};

From b476d9980e43999ac1dc88505c6d704447583204 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 11:43:12 -0800
Subject: [PATCH 013/217] clean compile_commands.json

---
 .../opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
index 2da0ab849..8b3799b37 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
@@ -4,7 +4,8 @@ clean_${CPP_LIB}_cpp() {
 
     set -euo pipefail;
 
-    rm -rf ~/"${CPP_SRC}/build/latest"/*;
+    rm -rf ~/"${CPP_SRC}/build/latest"/* \
+           ~/"${CPP_SRC}"/compile_commands.json;
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then

From dfc977f940b9f13dbfade684ffbfba53fe0b7121 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 11:43:36 -0800
Subject: [PATCH 014/217] intercept the --mode param and only pass it to the
 python build script

---
 .../rapids-build-utils/bin/tmpl/build.tmpl.sh   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
index c612589de..9cc2fdec4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
@@ -2,14 +2,27 @@
 
 build_${NAME}() {
     set -euo pipefail;
+
+    local mode="editable";
+
+    # pull out the --mode editable|wheel arg (if any)
+    eval "$(                                  \
+        devcontainer-utils-parse-args --names '
+            m|mode                            |
+        ' - <<< "$@"                          \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
+    mode="${m:-${mode:-"editable"}}";
+
     for lib in ${CPP_LIB}; do
         if type build-${lib}-cpp >/dev/null 2>&1; then
-            build-${lib}-cpp "$@";
+            build-${lib}-cpp ${__rest__[@]};
         fi
     done
     for lib in ${PY_LIB}; do
         if type build-${lib}-python >/dev/null 2>&1; then
-            build-${lib}-python "$@";
+            build-${lib}-python -m ${mode} ${__rest__[@]};
         fi
     done
 }

From 3d9bc1aac25e53ead301b33a4e19ed08279b75f2 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 11:44:22 -0800
Subject: [PATCH 015/217] support defining custom envvars in manifest.yaml
 python entries

---
 .../bin/generate-scripts.sh                   |  5 ++++-
 .../bin/tmpl/python-build-editable.tmpl.sh    | 21 +++++++++++--------
 .../bin/tmpl/python-build-wheel.tmpl.sh       | 21 +++++++++++--------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 580b2e0e4..633fa6811 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -21,6 +21,7 @@ generate_script() {
         cat - \
       | envsubst '$NAME
                   $SRC_PATH
+                  $PY_ENV
                   $PY_SRC
                   $PY_LIB
                   $CPP_LIB
@@ -152,7 +153,7 @@ generate_scripts() {
 
         repo_name="$(tr "[:upper:]" "[:lower:]" <<< "${!repo_name:-}")";
 
-        repo_names+=($repo_name)
+        repo_names+=($repo_name);
 
         # Generate a clone script for each repo
         (
@@ -230,6 +231,7 @@ generate_scripts() {
             local py_dirs=()
 
             for ((j=0; j < ${!py_length:-0}; j+=1)); do
+                local py_env="${repo}_python_${j}_env";
                 local py_name="${repo}_python_${j}_name";
                 local py_cmake_args="${repo}_python_${j}_args_cmake";
                 local pip_wheel_args="${repo}_python_${j}_args_wheel";
@@ -243,6 +245,7 @@ generate_scripts() {
                 (
                     PY_SRC="${py_path}"                       \
                     PY_LIB="${!py_name}"                      \
+                    PY_ENV="${!py_env:-}"                     \
                     CPP_ARGS="${args[@]}"                     \
                     CPP_DEPS="${deps[@]}"                     \
                     PY_CMAKE_ARGS="${!py_cmake_args:-}"       \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
index 478c639ef..03572e1b2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
@@ -78,15 +78,18 @@ build_${PY_LIB}_python_inplace() {
     local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
     local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
 
-    time                                         \
-    CUDAFLAGS="${cudaflags}"                     \
-    CMAKE_GENERATOR="Ninja"                      \
-    CMAKE_ARGS="${cmake_args[@]}"                \
-    SKBUILD_BUILD_OPTIONS="${ninja_args[@]}"     \
-    NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
-    SETUPTOOLS_ENABLE_FEATURES="legacy-editable" \
-        python -m pip install ${pip_args[@]}     \
-    ;
+    time (
+        CUDAFLAGS="${cudaflags}"                     \
+        CMAKE_GENERATOR="Ninja"                      \
+        CMAKE_ARGS="${cmake_args[@]}"                \
+        SKBUILD_BUILD_OPTIONS="${ninja_args[@]}"     \
+        NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
+        SETUPTOOLS_ENABLE_FEATURES="legacy-editable" \
+        ${PY_ENV} \
+            python -m pip install ${pip_args[@]}     \
+        ;
+        { set +x; } 2>/dev/null; echo -n "${PY_LIB} install time:";
+    ) 2>&1;
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
index 8aa35bac0..d448d3062 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
@@ -130,15 +130,18 @@ build_${PY_LIB}_python_wheel() {
     local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
     local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
 
-    time                                     \
-    CUDAFLAGS="${cudaflags}"                 \
-    CMAKE_GENERATOR="Ninja"                  \
-    PARALLEL_LEVEL="${n_jobs}"               \
-    CMAKE_ARGS="${cmake_args[@]}"            \
-    SKBUILD_BUILD_OPTIONS="${ninja_args[@]}" \
-    NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
-        python -m pip wheel ${pip_args[@]}   \
-    ;
+    time (
+        CUDAFLAGS="${cudaflags}"                 \
+        CMAKE_GENERATOR="Ninja"                  \
+        PARALLEL_LEVEL="${n_jobs}"               \
+        CMAKE_ARGS="${cmake_args[@]}"            \
+        SKBUILD_BUILD_OPTIONS="${ninja_args[@]}" \
+        NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
+        ${PY_ENV} \
+            python -m pip wheel ${pip_args[@]}   \
+        ;
+        { set +x; } 2>/dev/null; echo -n "${PY_LIB} wheel build time:";
+    ) 2>&1;
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then

From 3a8386280778315c7727fdab58ca98ac5298c45d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 11:54:59 -0800
Subject: [PATCH 016/217] keep cupy package version, just change the cuda
 modifier

---
 .../rapids-build-utils/bin/make-pip-dependencies.sh  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 168156847..619b4ba07 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -87,12 +87,12 @@ make_pip_dependencies() {
         done
 
         # Generate a combined requirements.txt file
-        cat ${pip_reqs_txts[@]}                                                                                   \
-          | grep -v '^#'                                                                                          \
-          | grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$"                     \
-          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                     \
-          | sed -E "s/cuda-python.*/cuda-python>=${cuda_version},<$((cuda_version_major+1)).0a0/g"                \
-          | sed -E "s/cupy-cuda[0-9]+x(==|>=|<=|>|<)?.*/cupy-cuda${cuda_version_major}x\1${cuda_version_major}/g" \
+        cat ${pip_reqs_txts[@]}                                                                    \
+          | grep -v '^#'                                                                           \
+          | grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$"      \
+          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                      \
+          | sed -E "s/cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                          \
+          | sed -E "s/cuda-python.*/cuda-python>=${cuda_version},<$((cuda_version_major+1)).0a0/g" \
         ;
 
         rm ${pip_reqs_txts[@]};

From b6db4ecb9d48c67080aa868e9fb45e845280aa6b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 17:36:03 -0800
Subject: [PATCH 017/217] clean more setuptools/distutils build dirs

---
 .../bin/tmpl/python-build-editable.tmpl.sh    |  9 ++--
 .../bin/tmpl/python-build-wheel.tmpl.sh       |  9 ++--
 .../bin/tmpl/python-clean.tmpl.sh             | 47 +++++++------------
 3 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
index 03572e1b2..6c9af01f5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
@@ -75,17 +75,18 @@ build_${PY_LIB}_python_inplace() {
 
     trap "rm -rf ~/'${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
 
-    local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
-    local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
-
     time (
+        export ${PY_ENV} PATH="$PATH";
+
+        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
+        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
+
         CUDAFLAGS="${cudaflags}"                     \
         CMAKE_GENERATOR="Ninja"                      \
         CMAKE_ARGS="${cmake_args[@]}"                \
         SKBUILD_BUILD_OPTIONS="${ninja_args[@]}"     \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
         SETUPTOOLS_ENABLE_FEATURES="legacy-editable" \
-        ${PY_ENV} \
             python -m pip install ${pip_args[@]}     \
         ;
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} install time:";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
index d448d3062..958c0dd2f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
@@ -127,17 +127,18 @@ build_${PY_LIB}_python_wheel() {
 
     trap "rm -rf ~/'${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
 
-    local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
-    local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
-
     time (
+        export ${PY_ENV} PATH="$PATH";
+
+        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
+        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
+
         CUDAFLAGS="${cudaflags}"                 \
         CMAKE_GENERATOR="Ninja"                  \
         PARALLEL_LEVEL="${n_jobs}"               \
         CMAKE_ARGS="${cmake_args[@]}"            \
         SKBUILD_BUILD_OPTIONS="${ninja_args[@]}" \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
-        ${PY_ENV} \
             python -m pip wheel ${pip_args[@]}   \
         ;
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} wheel build time:";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
index cb6b151cc..d5fbf29c9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
@@ -4,41 +4,30 @@ clean_${PY_LIB}_cpp() {
 
     set -euo pipefail;
 
-    local py_lib="$(tr '-' '_' <<< "${PY_LIB}")";
+    local py_lib="${PY_LIB}";
 
-    rm -rf ~/"${PY_SRC}"/{_skbuild,${py_lib}.egg-info};
+    rm -rf ~/"${PY_SRC}"/_skbuild \
+        ~/"${PY_SRC}"/{${py_lib},${py_lib//"-"/"_"}}.egg-info;
 
-    local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
-    python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
-    python_version="${python_version/./}";
-
-    local dir;
-    for dir in lib temp dist; do
-        local slug="${dir}.$(uname -s)-$(uname -m)";
-        if test -d ~/"${PY_SRC}"/build/${slug,,}-${python_version/./}; then
-            rm -rf ~/"${PY_SRC}"/build/${slug,,}-${python_version/./};
-        fi
-        if test -d ~/"${PY_SRC}"/build/${slug,,}-cpython-${python_version/./}; then
-            rm -rf ~/"${PY_SRC}"/build/${slug,,}-cpython-${python_version/./};
+    for lib in ${py_lib} ${py_lib//"-"/"_"}; do
+        if test -d ~/"${PY_SRC}"/${lib}/; then
+            find ~/"${PY_SRC}"/${lib}/ -type f \
+                -iname "*.cpython-*-$(uname -m)-$(uname -s)-*.so" \
+                -delete;
         fi
     done
 
-    if test -d ~/"${PY_SRC}"/build; then
-        for d in ~/"${PY_SRC}"/build/cp${python_version}-cp${python_version}*; do
-            rm -rf $d
-        done
-    fi
+    local py_ver="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
+    py_ver="$(grep -o '^[0-9]*.[0-9]*' <<< "${py_ver}")";
 
-    if test -d ~/"${PY_SRC}/${PY_LIB}"/; then
-        find ~/"${PY_SRC}/${PY_LIB}"/ -type f \
-            -iname "*.cpython-*-$(uname -m)-$(uname -s)-*.so" \
-            -delete;
-    fi
-
-    if test -d ~/"${PY_SRC}/${py_lib}"/; then
-        find ~/"${PY_SRC}/${py_lib}"/ -type f \
-            -iname "*.cpython-*-$(uname -m)-$(uname -s)-*.so" \
-            -delete;
+    if test -d ~/"${PY_SRC}"/build; then
+        local slug="$(uname -s)-$(uname -m)";
+        rm -rf                                                                                        \
+            `# scikit-buld-core build dirs`                                                           \
+            ~/"${PY_SRC}"/build/cp{${py_ver},${py_ver/./}}-cp{${py_ver},${py_ver/./}}*                \
+            `# setuptools/distutils build dirs`                                                       \
+            ~/"${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}                                       \
+            ~/"${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}-{,cpython}{,-}{${py_ver},${py_ver/./}};
     fi
 }
 

From fe4657966fe00de2d998bd634702a314b276d9e9 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 22:16:16 -0800
Subject: [PATCH 018/217] ignore grep's nonzero exit code

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .../opt/rapids-build-utils/bin/make-pip-env.sh              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 5f9d31125..7e2e9424f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -24,8 +24,10 @@ make_pip_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
-    rapids-make-pip-dependencies ${__rest__[@]}            \
-  | grep -v -e '^$' | tr -s "[:blank:]" | LC_ALL=C sort -u \
+    rapids-make-pip-dependencies ${__rest__[@]} \
+  | grep -v -e '^$' || true                     \
+  | tr -s "[:blank:]"                           \
+  | LC_ALL=C sort -u                            \
   > "${new_env_path}"
 
     if test -f "${new_env_path}"; then

From 2d6c9068646a76f1b433e6dad22e82c4c5dd8ab0 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 22:16:38 -0800
Subject: [PATCH 019/217] add cpp install and cpack scripts

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .../bin/generate-scripts.sh                   |  2 +-
 .../bin/tmpl/cpp-cpack.tmpl.sh                | 39 +++++++++++++++++++
 .../bin/tmpl/cpp-install.tmpl.sh              | 16 ++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 633fa6811..d91fda223 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -93,7 +93,7 @@ generate_repo_scripts() {
 
 generate_cpp_scripts() {
     local script_name;
-    for script_name in "configure" "build" "clean"; do (
+    for script_name in "configure" "build" "clean" "install" "cpack"; do (
         cat ${TMPL}/cpp-${script_name}.tmpl.sh         \
       | CPP_SRC="${SRC_PATH:-}${CPP_SRC:+/$CPP_SRC}"   \
         generate_script "${script_name}-${CPP_LIB}-cpp";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
new file mode 100755
index 000000000..0a9adfec6
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
@@ -0,0 +1,39 @@
+#! /usr/bin/env bash
+
+install_${CPP_LIB}_cpp() {
+    set -euo pipefail;
+
+    local verbose="";
+
+    eval "$(                                  \
+        devcontainer-utils-parse-args --names '
+            v|verbose                         |
+            o|out-dir                         |
+        ' - <<< "$@"                          \
+      | xargs -r -d'\n' -I% echo -n local %\; \
+    )";
+
+    verbose="${v:-${verbose:-}}";
+    out_dir="${o:-${out_dir:-}}";
+
+    time (
+        (
+            cd ~/"${CPP_SRC}"/build/latest/;
+            cpack -G TGZ ${verbose:+-V};
+        ) || true;
+
+        if test -d "${out_dir}"/; then
+            find ~/"${CPP_SRC}"/build/latest/ \
+                -iname "${CPP_LIB}-*.tar.gz"  \
+                -exec cp -a "{}" "${out_dir}"/;
+        fi
+
+        { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} CPack time:";
+    ) 2>&1;
+}
+
+if test -n "${rapids_build_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+install_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
new file mode 100755
index 000000000..7bffe7a65
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+
+install_${CPP_LIB}_cpp() {
+    set -euo pipefail;
+
+    time (
+        cmake --install ~/"${CPP_SRC}"/build/latest/ "$@";
+        { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} install time:";
+    ) 2>&1;
+}
+
+if test -n "${rapids_build_utils_debug:-}"; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+install_${CPP_LIB}_cpp "$@";

From 5bb2e4c29fbf782c1cf41bb7dcd2e5a06700802d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 12 Jan 2024 22:17:03 -0800
Subject: [PATCH 020/217] add a timing label to build and configure steps

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .../opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh      | 7 ++++++-
 .../opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh  | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
index 2259c6acf..9f2029a06 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
@@ -26,12 +26,17 @@ build_${CPP_LIB}_cpp() {
       | xargs -r -d'\n' -I% echo -n local %\;             \
     )";
 
-    time cmake                              \
+    # Build C++ lib
+    time (
+        cmake                               \
         --build ~/"${CPP_SRC}/build/latest" \
         ${verbose:+--verbose}               \
         -j${n_jobs}                         \
         --                                  \
         -l${n_load}                         ;
+        { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} build time:";
+    ) 2>&1;
+
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
index 7ca18fb9a..e5d68896f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
@@ -59,8 +59,11 @@ configure_${CPP_LIB}_cpp() {
     cmake_args+=(${verbose:+--log-level=VERBOSE});
     cmake_args+=(${__rest__[@]});
 
-    time CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
-         cmake ${cmake_args[@]};
+    time (
+        CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
+            cmake ${cmake_args[@]};
+        { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} configure time:";
+    ) 2>&1;
 
     if [[ ! -L ${source_dir}/compile_commands.json \
             || "$(readlink "${source_dir}/compile_commands.json")" \

From e14f787757518353eceb295b0ab99f47b437720e Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Sat, 13 Jan 2024 11:43:21 -0800
Subject: [PATCH 021/217] install system dependencies for ucxx, cudf_kafka, and
 cuspatial in pip containers (#209)

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .devcontainer/cuda11.8-pip/devcontainer.json | 2 ++
 .devcontainer/cuda12.0-pip/devcontainer.json | 2 ++
 .devcontainer/rapids.Dockerfile              | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index ff8d4f0fb..94212b758 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -10,10 +10,12 @@
   },
   "hostRequirements": {"gpu": "optional"},
   "features": {
+    "./features/src/ucx": {"version": "1.14.1"},
     "./features/src/cuda": {"installcuDNN": true},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
+    "./features/src/ucx",
     "./features/src/cuda",
     "./features/src/rapids-build-utils"
   ],
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index db0763b9f..186498d18 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -10,10 +10,12 @@
   },
   "hostRequirements": {"gpu": "optional"},
   "features": {
+    "./features/src/ucx": {"version": "1.14.1"},
     "./features/src/cuda": {"installcuDNN": true},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
+    "./features/src/ucx",
     "./features/src/cuda",
     "./features/src/rapids-build-utils"
   ],
diff --git a/.devcontainer/rapids.Dockerfile b/.devcontainer/rapids.Dockerfile
index 9d35e3f97..2400d6aa9 100644
--- a/.devcontainer/rapids.Dockerfile
+++ b/.devcontainer/rapids.Dockerfile
@@ -5,6 +5,14 @@ ARG PYTHON_PACKAGE_MANAGER=conda
 
 FROM ${BASE} as pip-base
 
+RUN apt update -y \
+ && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    # needed by libcudf_kafka
+    librdkafka-dev \
+    # needed by libcuspatial
+    sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev \
+ && rm -rf /tmp/* /var/tmp/* /var/cache/apt/* /var/lib/apt/lists/*;
+
 ENV DEFAULT_VIRTUAL_ENV=rapids
 
 FROM ${BASE} as conda-base

From 5b58b2f2c7111b49f0277e790a56f7c32ec6d460 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sat, 13 Jan 2024 11:46:17 -0800
Subject: [PATCH 022/217] run rapids-dependency-file-generator in parallel

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .../bin/make-conda-dependencies.sh            | 29 +++++++---
 .../bin/make-pip-dependencies.sh              | 53 +++++++++++--------
 .../rapids-build-utils/bin/make-pip-env.sh    |  2 +-
 3 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index edf05a2d2..90b4105b3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -1,5 +1,13 @@
 #! /usr/bin/env bash
 
+generate_env_yaml() {
+    (
+        (rapids-dependency-file-generator ${@:2} 2>/dev/null || echo "name: none") \
+      | (grep -v '^#' || [ "$?" == "1" ]) \
+      | tee "${1}" 1>/dev/null;
+    ) & true
+}
+
 make_conda_dependencies() {
 
     set -euo pipefail;
@@ -52,30 +60,37 @@ make_conda_dependencies() {
                 local keyi;
 
                 for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
-                    if rapids-dependency-file-generator                                       \
+                    local file="/tmp/${!repo_name}.${!py_name}.${repo_keys[$keyi]}.env.yaml";
+                    conda_env_yamls+=("${file}");
+                    generate_env_yaml                                                         \
+                        "${file}"                                                             \
                         --file_key ${repo_keys[$keyi]}                                        \
                         --output conda                                                        \
                         --config ~/"${!repo_path}/dependencies.yaml"                          \
                         --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
-                        `# --stdout` \
-                    >> /tmp/${!repo_name}.${!py_name}.${keyi}.env.yaml 2>/dev/null; then
-                        conda_env_yamls+=("/tmp/${!repo_name}.${!py_name}.${keyi}.env.yaml");
-                    fi
+                        ;
                 done
             done
         fi
     done
 
     if test ${#conda_env_yamls[@]} -gt 0; then
+
+        for ((i=0; i < ${#conda_env_yamls[@]}; i+=1)); do
+            while ! test -f "${conda_env_yamls[$i]}"; do
+                sleep 0.1;
+            done
+        done
+
         local conda_noinstall=($(rapids-python-pkg-names) $(rapids-python-conda-pkg-names));
         # Generate a combined conda env yaml file.
-        conda-merge ${conda_env_yamls[@]}                                                                \
+        conda-merge "${conda_env_yamls[@]}"                                                              \
           | grep -v '^name:'                                                                             \
           | grep -v -P '^[ ]*?\- (\.git\@[^(main|master)])(.*?)$'                                        \
           | grep -v -P "^[ ]*?\- ($(tr -d '[:blank:]' <<< "${conda_noinstall[@]/%/ |}"))(=.*|>.*|<.*)?$" \
           ;
 
-        rm ${conda_env_yamls[@]};
+        rm -f "${conda_env_yamls[@]}";
     fi
 }
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 619b4ba07..64635c628 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -1,8 +1,16 @@
 #! /usr/bin/env bash
 
+generate_requirements() {
+    (
+        (rapids-dependency-file-generator ${@:2} 2>/dev/null || echo "") \
+      | (grep -v '^#' || [ "$?" == "1" ]) \
+      | tee "${1}" 1>/dev/null;
+    ) & true
+}
+
 make_pip_dependencies() {
 
-    set -euo pipefail;
+    set -Eeuo pipefail;
 
     local keys=();
 
@@ -19,12 +27,8 @@ make_pip_dependencies() {
     fi
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
-    cuda_version="$(grep -o '^[0-9]*.[0-9]*.[0-9]' <<< "${cuda_version}")";
+    cuda_version="$(grep -o '^[0-9]*.[0-9]*' <<< "${cuda_version}")";
     local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
-    local cuda_version_minor="$(cut -d'.' -f2 <<< "${cuda_version}")";
-    local cuda_version_patch="$(cut -d'.' -f3 <<< "${cuda_version}")";
-    local cuda_version_mm="${cuda_version_major}.${cuda_version_minor:-0}";
-    cuda_version="${cuda_version_mm}.${cuda_version_patch:-0}";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
@@ -57,15 +61,15 @@ make_pip_dependencies() {
                 local keyi;
 
                 for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
-                    if rapids-dependency-file-generator                                          \
-                        --file_key ${repo_keys[$keyi]}                                           \
-                        --output requirements                                                    \
-                        --config ~/"${!repo_path}/dependencies.yaml"                             \
-                        --matrix "arch=$(uname -m);cuda=${cuda_version_mm};py=${python_version}" \
-                        `# --stdout` \
-                    >> /tmp/${!repo_name}.${!py_name}.${keyi}.requirements.txt 2>/dev/null; then
-                        pip_reqs_txts+=("/tmp/${!repo_name}.${!py_name}.${keyi}.requirements.txt");
-                    fi
+                    local file="/tmp/${!repo_name}.${!py_name}.${repo_keys[$keyi]}.requirements.txt";
+                    pip_reqs_txts+=("${file}");
+                    generate_requirements                                                     \
+                        "${file}"                                                             \
+                        --file_key ${repo_keys[$keyi]}                                        \
+                        --output requirements                                                 \
+                        --config ~/"${!repo_path}/dependencies.yaml"                          \
+                        --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
+                        ;
                 done
             done
         fi
@@ -73,6 +77,12 @@ make_pip_dependencies() {
 
     if test ${#pip_reqs_txts[@]} -gt 0; then
 
+        for ((i=0; i < ${#pip_reqs_txts[@]}; i+=1)); do
+            while ! test -f "${pip_reqs_txts[$i]}"; do
+                sleep 0.1;
+            done
+        done
+
         local pip_noinstall=();
 
         # add all python packages to the noinstall list.
@@ -87,15 +97,14 @@ make_pip_dependencies() {
         done
 
         # Generate a combined requirements.txt file
-        cat ${pip_reqs_txts[@]}                                                                    \
-          | grep -v '^#'                                                                           \
-          | grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$"      \
-          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                      \
-          | sed -E "s/cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                          \
-          | sed -E "s/cuda-python.*/cuda-python>=${cuda_version},<$((cuda_version_major+1)).0a0/g" \
+        cat "${pip_reqs_txts[@]}"                                                                                   \
+          | (grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ])  \
+          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                       \
+          | sed -E "s/cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                                           \
+          | sed -E "s/cuda-python.*/cuda-python>=${cuda_version}.0,<$((cuda_version_major+1)).0a0/g"                \
         ;
 
-        rm ${pip_reqs_txts[@]};
+        rm -f "${pip_reqs_txts[@]}";
     fi
 }
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 7e2e9424f..397a90815 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -25,7 +25,7 @@ make_pip_env() {
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
     rapids-make-pip-dependencies ${__rest__[@]} \
-  | grep -v -e '^$' || true                     \
+  | (grep -v -E '^$' || [ "$?" == "1" ])        \
   | tr -s "[:blank:]"                           \
   | LC_ALL=C sort -u                            \
   > "${new_env_path}"

From dee1b73ee30dad2451e76f4bd76b57e2d1d959d1 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sat, 13 Jan 2024 11:46:54 -0800
Subject: [PATCH 023/217] use absolute paths

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .../rapids-build-utils/bin/generate-scripts.sh | 18 +++++++++---------
 .../rapids-build-utils/bin/tmpl/clone.tmpl.sh  | 12 ++++++------
 .../bin/tmpl/cpp-build.tmpl.sh                 |  7 +++----
 .../bin/tmpl/cpp-clean.tmpl.sh                 |  4 ++--
 .../bin/tmpl/cpp-configure.tmpl.sh             |  8 ++++----
 .../bin/tmpl/cpp-cpack.tmpl.sh                 |  7 ++++---
 .../bin/tmpl/cpp-install.tmpl.sh               |  5 +++--
 .../bin/tmpl/python-build-editable.tmpl.sh     |  8 ++++----
 .../bin/tmpl/python-build-wheel.tmpl.sh        |  8 ++++----
 .../bin/tmpl/python-clean.tmpl.sh              | 16 ++++++++--------
 10 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index d91fda223..672ca498a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -158,7 +158,7 @@ generate_scripts() {
         # Generate a clone script for each repo
         (
             NAME="${repo_name:-}"             \
-            SRC_PATH="${!repo_path:-}"        \
+            SRC_PATH=~/"${!repo_path:-}"      \
             GIT_TAG="${!git_tag:-}"           \
             GIT_REPO="${!git_repo:-}"         \
             GIT_HOST="${!git_host:-}"         \
@@ -177,7 +177,7 @@ generate_scripts() {
                 local cpp_args="${repo}_cpp_${j}_args";
                 local cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
                 local cpp_depends_length="${repo}_cpp_${j}_depends_length";
-                local cpp_path="${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
+                local cpp_path=~/"${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
 
                 cpp_dirs+=("${cpp_path}");
                 cpp_libs+=("${!cpp_name:-}");
@@ -201,12 +201,12 @@ generate_scripts() {
                 done
 
                 (
-                    SRC_PATH="${!repo_path:-}"  \
-                    CPP_LIB="${cpp_name:-}"     \
-                    CPP_SRC="${!cpp_sub_dir:-}" \
-                    CPP_ARGS="${!cpp_args:-}"   \
-                    CPP_DEPS="${deps[@]}"       \
-                    generate_cpp_scripts        ;
+                    SRC_PATH=~/"${!repo_path:-}" \
+                    CPP_LIB="${cpp_name:-}"      \
+                    CPP_SRC="${!cpp_sub_dir:-}"  \
+                    CPP_ARGS="${!cpp_args:-}"    \
+                    CPP_DEPS="${deps[@]}"        \
+                    generate_cpp_scripts         ;
                 ) || true;
             done
 
@@ -238,7 +238,7 @@ generate_scripts() {
                 local pip_install_args="${repo}_python_${j}_args_install";
                 local py_sub_dir="${repo}_python_${j}_sub_dir";
                 local py_depends_length="${repo}_python_${j}_depends_length";
-                local py_path="${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
+                local py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
 
                 py_libs+=(${!py_name});
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
index c80e320e4..8e569a9be 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
@@ -3,7 +3,7 @@
 clone_${NAME}() {
     set -euo pipefail;
 
-    if [[ ! -d ~/"${SRC_PATH}"/.git ]]; then
+    if [[ ! -d "${SRC_PATH}"/.git ]]; then
 
         local branch=;
         local upstream=;
@@ -25,7 +25,7 @@ clone_${NAME}() {
         )";
 
         branch="${b:-${branch:-"${GIT_TAG}"}}";
-        directory="${d:-${directory:-"${HOME}/${SRC_PATH}"}}";
+        directory="${d:-${directory:-"${SRC_PATH}"}}";
         upstream="${u:-${upstream:-"${GIT_UPSTREAM}/${GIT_REPO}"}}";
 
         echo 'Cloning ${NAME}' 1>&2;
@@ -43,14 +43,14 @@ clone_${NAME}() {
             "${directory}"                        \
         ;
 
-        git -C ~/"${SRC_PATH}" config --add remote.upstream.fetch '^refs/heads/pull-request/*';
+        git -C "${SRC_PATH}" config --add remote.upstream.fetch '^refs/heads/pull-request/*';
 
-        local upstream_branches="$(git -C ~/"${SRC_PATH}" branch --remotes --list 'upstream/pull-request/*')";
+        local upstream_branches="$(git -C "${SRC_PATH}" branch --remotes --list 'upstream/pull-request/*')";
         if test -n "${upstream_branches:-}"; then
-            git -C ~/"${SRC_PATH}" branch --remotes -d ${upstream_branches};
+            git -C "${SRC_PATH}" branch --remotes -d ${upstream_branches};
         fi
 
-        git -C ~/"${SRC_PATH}" remote prune upstream;
+        git -C "${SRC_PATH}" remote prune upstream;
 
         if test -z "${no_update_env:-}"; then
             rapids-update-content-command;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
index 9f2029a06..4d0def9be 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
@@ -2,9 +2,9 @@
 
 build_${CPP_LIB}_cpp() {
 
-    set -euo pipefail;
+    set -Eeuo pipefail;
 
-    if [[ ! -d ~/"${CPP_SRC}" ]]; then
+    if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
     fi
 
@@ -29,14 +29,13 @@ build_${CPP_LIB}_cpp() {
     # Build C++ lib
     time (
         cmake                               \
-        --build ~/"${CPP_SRC}/build/latest" \
+        --build "${CPP_SRC}/build/latest"   \
         ${verbose:+--verbose}               \
         -j${n_jobs}                         \
         --                                  \
         -l${n_load}                         ;
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} build time:";
     ) 2>&1;
-
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
index 8b3799b37..f25c83766 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
@@ -4,8 +4,8 @@ clean_${CPP_LIB}_cpp() {
 
     set -euo pipefail;
 
-    rm -rf ~/"${CPP_SRC}/build/latest"/* \
-           ~/"${CPP_SRC}"/compile_commands.json;
+    rm -rf "${CPP_SRC}/build/latest"/* \
+           "${CPP_SRC}"/compile_commands.json;
 }
 
 if test -n "${rapids_build_utils_debug:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
index e5d68896f..9b53e5e1f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
@@ -2,9 +2,9 @@
 
 configure_${CPP_LIB}_cpp() {
 
-    set -euo pipefail;
+    set -Eeuo pipefail;
 
-    if [[ ! -d ~/"${CPP_SRC}" ]]; then
+    if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
     fi
 
@@ -39,8 +39,8 @@ configure_${CPP_LIB}_cpp() {
     )";
 
     local build_type="$(rapids-parse-cmake-build-type ${__rest__[@]} | tr '[:upper:]' '[:lower:]')";
-    local binary_dir=~/"${CPP_SRC}/build/${build_type}";
-    local source_dir=~/"${CPP_SRC}";
+    local binary_dir="${CPP_SRC}/build/${build_type}";
+    local source_dir="${CPP_SRC}";
 
     # Reconfigure if previous configure failed
     if [[ ! -f ${binary_dir}/build.ninja ]]; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
index 0a9adfec6..be1645ea7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
@@ -1,7 +1,8 @@
 #! /usr/bin/env bash
 
 install_${CPP_LIB}_cpp() {
-    set -euo pipefail;
+
+    set -Eeuo pipefail;
 
     local verbose="";
 
@@ -18,12 +19,12 @@ install_${CPP_LIB}_cpp() {
 
     time (
         (
-            cd ~/"${CPP_SRC}"/build/latest/;
+            cd "${CPP_SRC}"/build/latest/;
             cpack -G TGZ ${verbose:+-V};
         ) || true;
 
         if test -d "${out_dir}"/; then
-            find ~/"${CPP_SRC}"/build/latest/ \
+            find "${CPP_SRC}"/build/latest/ \
                 -iname "${CPP_LIB}-*.tar.gz"  \
                 -exec cp -a "{}" "${out_dir}"/;
         fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
index 7bffe7a65..bee264bb4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
@@ -1,10 +1,11 @@
 #! /usr/bin/env bash
 
 install_${CPP_LIB}_cpp() {
-    set -euo pipefail;
+
+    set -Eeuo pipefail;
 
     time (
-        cmake --install ~/"${CPP_SRC}"/build/latest/ "$@";
+        cmake --install "${CPP_SRC}"/build/latest/ "$@";
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} install time:";
     ) 2>&1;
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
index 6c9af01f5..228aca4b2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
@@ -2,9 +2,9 @@
 
 build_${PY_LIB}_python_inplace() {
 
-    set -euo pipefail;
+    set -Eeuo pipefail;
 
-    if [[ ! -d ~/"${PY_SRC}" ]]; then
+    if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
     fi
 
@@ -69,11 +69,11 @@ build_${PY_LIB}_python_inplace() {
     pip_args+=("--no-build-isolation");
     pip_args+=("--no-deps");
     pip_args+=("--editable");
-    pip_args+=(~/"${PY_SRC}");
+    pip_args+=("${PY_SRC}");
 
     cmake_args+=("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON");
 
-    trap "rm -rf ~/'${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
+    trap "rm -rf '${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
 
     time (
         export ${PY_ENV} PATH="$PATH";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
index 958c0dd2f..4e7a15470 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
@@ -2,9 +2,9 @@
 
 build_${PY_LIB}_python_wheel() {
 
-    set -euo pipefail;
+    set -Eeuo pipefail;
 
-    if [[ ! -d ~/"${PY_SRC}" ]]; then
+    if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
     fi
 
@@ -123,9 +123,9 @@ build_${PY_LIB}_python_wheel() {
         pip_args+=("--no-build-isolation");
     fi
 
-    pip_args+=(~/"${PY_SRC}");
+    pip_args+=("${PY_SRC}");
 
-    trap "rm -rf ~/'${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
+    trap "rm -rf '${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
 
     time (
         export ${PY_ENV} PATH="$PATH";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
index d5fbf29c9..22d7f0bee 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
@@ -6,12 +6,12 @@ clean_${PY_LIB}_cpp() {
 
     local py_lib="${PY_LIB}";
 
-    rm -rf ~/"${PY_SRC}"/_skbuild \
-        ~/"${PY_SRC}"/{${py_lib},${py_lib//"-"/"_"}}.egg-info;
+    rm -rf "${PY_SRC}"/_skbuild \
+        "${PY_SRC}"/{${py_lib},${py_lib//"-"/"_"}}.egg-info;
 
     for lib in ${py_lib} ${py_lib//"-"/"_"}; do
-        if test -d ~/"${PY_SRC}"/${lib}/; then
-            find ~/"${PY_SRC}"/${lib}/ -type f \
+        if test -d "${PY_SRC}"/${lib}/; then
+            find "${PY_SRC}"/${lib}/ -type f \
                 -iname "*.cpython-*-$(uname -m)-$(uname -s)-*.so" \
                 -delete;
         fi
@@ -20,14 +20,14 @@ clean_${PY_LIB}_cpp() {
     local py_ver="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     py_ver="$(grep -o '^[0-9]*.[0-9]*' <<< "${py_ver}")";
 
-    if test -d ~/"${PY_SRC}"/build; then
+    if test -d "${PY_SRC}"/build; then
         local slug="$(uname -s)-$(uname -m)";
         rm -rf                                                                                        \
             `# scikit-buld-core build dirs`                                                           \
-            ~/"${PY_SRC}"/build/cp{${py_ver},${py_ver/./}}-cp{${py_ver},${py_ver/./}}*                \
+            "${PY_SRC}"/build/cp{${py_ver},${py_ver/./}}-cp{${py_ver},${py_ver/./}}*                \
             `# setuptools/distutils build dirs`                                                       \
-            ~/"${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}                                       \
-            ~/"${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}-{,cpython}{,-}{${py_ver},${py_ver/./}};
+            "${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}                                       \
+            "${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}-{,cpython}{,-}{${py_ver},${py_ver/./}};
     fi
 }
 

From 74f027f44b131373cf61950471ad335240b8fb4a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 16 Jan 2024 19:47:37 -0800
Subject: [PATCH 024/217] fix find command

---
 .../opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
index be1645ea7..ee6909acb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-install_${CPP_LIB}_cpp() {
+cpack_${CPP_LIB}_cpp() {
 
     set -Eeuo pipefail;
 
@@ -24,9 +24,9 @@ install_${CPP_LIB}_cpp() {
         ) || true;
 
         if test -d "${out_dir}"/; then
-            find "${CPP_SRC}"/build/latest/ \
-                -iname "${CPP_LIB}-*.tar.gz"  \
-                -exec cp -a "{}" "${out_dir}"/;
+            find "${CPP_SRC}"/build/latest/     \
+                -iname "${CPP_LIB}-*.tar.gz"    \
+                -exec cp -a "{}" "${out_dir}"/ \;
         fi
 
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} CPack time:";
@@ -37,4 +37,4 @@ if test -n "${rapids_build_utils_debug:-}"; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-install_${CPP_LIB}_cpp "$@";
+cpack_${CPP_LIB}_cpp "$@";

From b568c49ef052a39b5464d97250dc274d710c283b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 16 Jan 2024 19:47:49 -0800
Subject: [PATCH 025/217] allow passing extra requirements

---
 .../opt/rapids-build-utils/bin/make-pip-dependencies.sh    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 64635c628..bdd775112 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -13,10 +13,12 @@ make_pip_dependencies() {
     set -Eeuo pipefail;
 
     local keys=();
+    local requirements=();
 
     eval "$(                                  \
         devcontainer-utils-parse-args --names '
             k|keys                            |
+            r|requirement                     |
         ' - <<< "$@"                          \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
@@ -26,6 +28,9 @@ make_pip_dependencies() {
         keys=(py_build py_run py_test all);
     fi
 
+    if test -v r; then requirements+=(${r[@]}); fi
+    if test -v requirement; then requirements+=(${requirement[@]}); fi
+
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]*' <<< "${cuda_version}")";
     local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
@@ -97,7 +102,7 @@ make_pip_dependencies() {
         done
 
         # Generate a combined requirements.txt file
-        cat "${pip_reqs_txts[@]}"                                                                                   \
+        cat "${requirements[@]}" "${pip_reqs_txts[@]}"                                                              \
           | (grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ])  \
           | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                       \
           | sed -E "s/cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                                           \

From a8b1313b507df4640776b42d3faf901a1dcd6224 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 12:56:05 -0800
Subject: [PATCH 026/217] add devcontainer-utils-parse-args-from-docstring
 script

---
 .../bin/parse-args-from-docstring.sh          | 48 +++++++++++++++++++
 .../utils/opt/devcontainer/bin/parse-args.sh  | 10 ++--
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100755 features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh

diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
new file mode 100755
index 000000000..5651568ce
--- /dev/null
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -0,0 +1,48 @@
+#! /usr/bin/env bash
+
+if test -n "${devcontainer_utils_debug:-}" \
+&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+  || test -z "${devcontainer_utils_debug##*"parse-args"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+print_usage() {
+    sed -n '2,/^$/p' "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}" | sed -r 's/^# ?//';
+}
+
+parse_names_from_usage() {
+    cat - \
+  | sed -rn 's/^([ ]*)(--?[^ ]+|,|_|\*)+(.*)$/\2/p' \
+  | sed -r 's/--?([^ ,]+)+,?/\1|/g' \
+  | sed -r 's/\*/\\*/g';
+}
+
+parse_bool_names_from_usage() {
+    cat - \
+  | sed -rn 's/^([ ]*)(--?[^ ]+|,|_)+([^<]*)$/\2/p' \
+  | sed -r 's/(,|\|)/ /g';
+}
+
+parse_value_names_from_usage() {
+    cat - \
+  | sed -rn 's/^([ ]*)(--?[^ \*]+|,|_)+[ ]*<(.[^>]*).*$/\2/p' \
+  | sed -r 's/(,|\|)/ /g';
+}
+
+parse_value_types_from_usage() {
+    cat - \
+  | sed -rn 's/^([ ]*)(--?[^ \*]+|,|_)+[ ]*<(.[^>]*).*$/\3/p';
+}
+
+parse_args_or_show_help() {
+    eval "$(                                                  \
+        devcontainer-utils-parse-args                         \
+            --names "$(print_usage | parse_names_from_usage)" \
+        "$@" <&0                                              \
+    | xargs -r -d'\n' -I% echo -n export %\;                  \
+    )";
+    if test -n "${h:-${help:-${usage:-}}}"; then
+        print_usage >&2;
+        exit 0;
+    fi
+}
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index f04106a48..74f2732b1 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -11,8 +11,8 @@ parse_args() {
     local vars_array=();
     if [ "${1:-}" = "--names" ]; then
         shift;
-        vars="$(tr -d '[:space:]' <<< "${1}")";
-        vars_array=($(tr '|' ' ' <<< "${vars}"));
+        vars="$(tr -d '[:space:]' <<< "${1}"  | rev | cut -d'|' -f1 --complement | rev)";
+        vars_array=("${vars//|/ }");
         readarray -t vars_array < <(
             for str in "${vars_array[@]}"; do
                 printf '%d\t%s\n' "${#str}" "$str"
@@ -78,6 +78,8 @@ parse_args() {
                 else
                     val="true";
                 fi
+            else
+                rest+=("${arg@Q}");
             fi
         else
             rest+=("${@@Q}");
@@ -121,7 +123,9 @@ parse_args() {
     done
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
+if test -n "${devcontainer_utils_debug:-}" \
+&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+  || test -z "${devcontainer_utils_debug##*"parse-args"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 

From fb8482c5d786b8017ad9da31d9fdf6d42277b643 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 12:57:45 -0800
Subject: [PATCH 027/217] add bash completion template

---
 features/src/utils/install.sh                 |  62 ++++++----
 .../devcontainer/bin/bash/completion.tmpl.sh  | 108 ++++++++++++++++++
 2 files changed, 149 insertions(+), 21 deletions(-)
 create mode 100755 features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh

diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 6c4496443..2e8d8f6b5 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -62,34 +62,54 @@ find /opt/devcontainer \
     -o -type f -exec chmod 0755 {} \; \);
 
 install_utility() {
-    update-alternatives --install "/usr/bin/$1" "$1" "/opt/devcontainer/bin/$2" 0;
+    local cmd="devcontainer-utils-${1}";
+    local src="${2:-"${1}.sh"}";
+    # Install alternative
+    update-alternatives --install /usr/bin/${cmd} ${cmd} /opt/devcontainer/bin/${src} 0;
+
+    # Install bash_completion script
+    cat "$(which devcontainer-utils-bash-completion.tmpl)" \
+  | SCRIPT="${cmd}"                                        \
+    NAME="${cmd//-/_}"                                     \
+    envsubst '$SCRIPT $NAME'                               \
+  | tee "/etc/bash_completion.d/${cmd}" >/dev/null         \
+  ;
 }
 
-install_utility devcontainer-utils-parse-args parse-args.sh;
-install_utility devcontainer-utils-shell-is-interactive shell-is-interactive.sh;
-install_utility devcontainer-utils-post-attach-command post-attach-command.sh;
-install_utility devcontainer-utils-post-attach-command-entrypoint post-attach-command-entrypoint.sh;
-install_utility devcontainer-utils-python-repl-startup python-repl-startup.py;
-install_utility devcontainer-utils-init-git git/init.sh;
-install_utility devcontainer-utils-clone-git-repo git/repo/clone.sh;
+# Install alternatives
 
-install_utility devcontainer-utils-init-ssh-deploy-keys ssh/init-deploy-keys.sh;
+# Install this first since we use it in `install_utility`
+update-alternatives --install \
+    /usr/bin/devcontainer-utils-bash-completion.tmpl \
+             devcontainer-utils-bash-completion.tmpl \
+    /opt/devcontainer/bin/bash/completion.tmpl.sh   0;
 
-install_utility devcontainer-utils-init-github-cli   github/cli/init.sh;
-install_utility devcontainer-utils-clone-github-repo github/repo/clone.sh;
+install_utility parse-args parse-args.sh;
+install_utility parse-args-from-docstring parse-args-from-docstring.sh;
+install_utility shell-is-interactive shell-is-interactive.sh;
+install_utility post-attach-command post-attach-command.sh;
+install_utility post-attach-command-entrypoint post-attach-command-entrypoint.sh;
+install_utility python-repl-startup python-repl-startup.py;
+install_utility init-git git/init.sh;
+install_utility clone-git-repo git/repo/clone.sh;
 
-install_utility devcontainer-utils-init-gitlab-cli                    gitlab/cli/init.sh;
-install_utility devcontainer-utils-clone-gitlab-repo                  gitlab/repo/clone.sh;
-install_utility devcontainer-utils-print-missing-gitlab-token-warning gitlab/print-missing-token-warning.sh;
+install_utility init-ssh-deploy-keys ssh/init-deploy-keys.sh;
 
-install_utility devcontainer-utils-vault-auth-github vault/auth/github.sh;
+install_utility init-github-cli   github/cli/init.sh;
+install_utility clone-github-repo github/repo/clone.sh;
 
-install_utility devcontainer-utils-vault-s3-init            vault/s3/init.sh;
-install_utility devcontainer-utils-vault-s3-creds-generate  vault/s3/creds/generate.sh;
-install_utility devcontainer-utils-vault-s3-creds-persist   vault/s3/creds/persist.sh;
-install_utility devcontainer-utils-vault-s3-creds-propagate vault/s3/creds/propagate.sh;
-install_utility devcontainer-utils-vault-s3-creds-schedule  vault/s3/creds/schedule.sh;
-install_utility devcontainer-utils-vault-s3-creds-test      vault/s3/creds/test.sh;
+install_utility init-gitlab-cli                    gitlab/cli/init.sh;
+install_utility clone-gitlab-repo                  gitlab/repo/clone.sh;
+install_utility print-missing-gitlab-token-warning gitlab/print-missing-token-warning.sh;
+
+install_utility vault-auth-github vault/auth/github.sh;
+
+install_utility vault-s3-init            vault/s3/init.sh;
+install_utility vault-s3-creds-generate  vault/s3/creds/generate.sh;
+install_utility vault-s3-creds-persist   vault/s3/creds/persist.sh;
+install_utility vault-s3-creds-propagate vault/s3/creds/propagate.sh;
+install_utility vault-s3-creds-schedule  vault/s3/creds/schedule.sh;
+install_utility vault-s3-creds-test      vault/s3/creds/test.sh;
 
 # Enable GCC colors
 for_each_user_bashrc 'sed -i -re "s/^#(export GCC_COLORS)/\1/g" "$0"';
diff --git a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
new file mode 100755
index 000000000..4b7f060af
--- /dev/null
+++ b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+
+. devcontainer-utils-parse-args-from-docstring;
+
+_zip_lines() {
+    local line_1="";
+    local args_1=();
+    local line_2="";
+    while read -r line_1; do
+        args_1=(${line_1});
+        while read -r line_2; do
+            local idx;
+            for ((idx=0; idx < ${#args_1[@]}; idx+=1)); do
+                echo "${line_2}";
+            done
+            break;
+        done < "${2}";
+    done < "${1}";
+}
+
+${NAME}_script="";
+${NAME}_usage="";
+${NAME}_bool_names=();
+${NAME}_value_names=();
+${NAME}_value_types="";
+${NAME}_option_names="";
+
+_${NAME}_completions() {
+    # trap 'sleep 10;' EXIT;
+
+    COMPREPLY=();
+
+    if test -z "${${NAME}_script}"; then
+        ${NAME}_script="$(which ${SCRIPT})";
+        if test -z "${${NAME}_script}"; then return; fi
+    fi
+    if test -z "${${NAME}_usage}"; then
+        ${NAME}_usage="$(sed -n '2,/^$/p' "${${NAME}_script}" | sed -r 's/^# ?//')";
+        if test -z "${${NAME}_usage}"; then return; fi
+    fi
+    if test "${#${NAME}_bool_names[@]}" -eq 0; then
+        ${NAME}_bool_names=($(parse_bool_names_from_usage <<< "${${NAME}_usage}"));
+    fi
+    if test "${#${NAME}_value_names[@]}" -eq 0; then
+        ${NAME}_value_names=($(parse_value_names_from_usage <<< "${${NAME}_usage}"));
+    fi
+    if test -z "${${NAME}_value_types}"; then
+        ${NAME}_value_types="$(_zip_lines                          \
+            <(parse_value_names_from_usage <<< "${${NAME}_usage}") \
+            <(parse_value_types_from_usage <<< "${${NAME}_usage}") \
+        )";
+    fi
+    if test -z "${${NAME}_option_names}"; then
+        ${NAME}_option_names="${${NAME}_bool_names[*]} ${${NAME}_value_names[*]}";
+    fi
+
+    local type_;
+    local idx_a=0;
+    local idx_b=0;
+
+    if test "${COMP_CWORD}" -gt 1; then
+        for ((idx_a=0; idx_a < ${#${NAME}_value_names[@]}; idx_a+=1)); do
+            if [[ ${${NAME}_value_names[$idx_a]} == ${COMP_WORDS[$COMP_CWORD-1]}* ]]; then
+                while read -r type_; do
+                    if test ${idx_b} != ${idx_a}; then
+                        idx_b=$((idx_b + 1));
+                        continue;
+                    fi
+                    case "${type_}" in
+                        num)
+                            COMPREPLY=($(grep -P "^[0-9]+$" <<< "${COMP_WORDS[$COMP_CWORD]}"));
+                            ;;
+                        dir)
+                            COMPREPLY=($(compgen -o nosort -o dirnames -- "${COMP_WORDS[$COMP_CWORD]}"));
+                            ;;
+                        file)
+                            COMPREPLY=($(compgen -o nosort -o filenames -- "${COMP_WORDS[$COMP_CWORD]}"));
+                            ;;
+                        path)
+                            COMPREPLY=($(compgen -o nosort -o default -- "${COMP_WORDS[$COMP_CWORD]}"));
+                            ;;
+                        *)
+                            COMPREPLY=();
+                            ;;
+                    esac
+                    break;
+                done <<< "${${NAME}_value_types}";
+                return;
+            fi
+        done
+    fi
+
+    for ((idx_a=0; idx_a < ${#${NAME}_bool_names[@]}; idx_a+=1)); do
+        if [[ ${${NAME}_bool_names[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
+            COMPREPLY=($(compgen -o nosort -W "${${NAME}_option_names}" -- "${COMP_WORDS[$COMP_CWORD]}"));
+            return;
+        fi
+    done
+
+    for ((idx_a=0; idx_a < ${#${NAME}_value_names[@]}; idx_a+=1)); do
+        if [[ ${${NAME}_value_names[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
+            COMPREPLY=($(compgen -o nosort -W "${${NAME}_option_names}" -- "${COMP_WORDS[$COMP_CWORD]}"));
+            return;
+        fi
+    done
+}
+
+complete -F _${NAME}_completions ${SCRIPT};

From a3ef3ae6dabbe83cb1a69d7d20c0c2f25de00e43 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 12:58:11 -0800
Subject: [PATCH 028/217] generate completions for rapids-build-utils scripts

---
 features/src/rapids-build-utils/install.sh | 61 ++++++++++++++--------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 556b092ec..29dc5064d 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -31,29 +31,44 @@ fi
 
 cp -ar ./opt/rapids-build-utils /opt/;
 
-update-alternatives --install /usr/bin/rapids-update-content-command        rapids-update-content-command       /opt/rapids-build-utils/bin/update-content-command.sh       0;
-update-alternatives --install /usr/bin/rapids-post-start-command            rapids-post-start-command           /opt/rapids-build-utils/bin/post-start-command.sh           0;
-update-alternatives --install /usr/bin/rapids-post-attach-command           rapids-post-attach-command          /opt/rapids-build-utils/bin/post-attach-command.sh          0;
-update-alternatives --install /usr/bin/rapids-checkout-same-branch          rapids-checkout-same-branch         /opt/rapids-build-utils/bin/checkout-same-branch.sh         0;
-update-alternatives --install /usr/bin/rapids-pull-repositories             rapids-pull-repositories            /opt/rapids-build-utils/bin/pull-repositories.sh            0;
-update-alternatives --install /usr/bin/rapids-push-repositories             rapids-push-repositories            /opt/rapids-build-utils/bin/push-repositories.sh            0;
-update-alternatives --install /usr/bin/rapids-generate-scripts              rapids-generate-scripts             /opt/rapids-build-utils/bin/generate-scripts.sh             0;
-update-alternatives --install /usr/bin/rapids-join-strings                  rapids-join-strings                 /opt/rapids-build-utils/bin/join-strings.sh                 0;
-update-alternatives --install /usr/bin/rapids-make-conda-dependencies       rapids-make-conda-dependencies      /opt/rapids-build-utils/bin/make-conda-dependencies.sh      0;
-update-alternatives --install /usr/bin/rapids-make-conda-env                rapids-make-conda-env               /opt/rapids-build-utils/bin/make-conda-env.sh               0;
-update-alternatives --install /usr/bin/rapids-make-pip-dependencies         rapids-make-pip-dependencies        /opt/rapids-build-utils/bin/make-pip-dependencies.sh        0;
-update-alternatives --install /usr/bin/rapids-make-pip-env                  rapids-make-pip-env                 /opt/rapids-build-utils/bin/make-pip-env.sh                 0;
-update-alternatives --install /usr/bin/rapids-make-vscode-workspace         rapids-make-vscode-workspace        /opt/rapids-build-utils/bin/make-vscode-workspace.sh        0;
-update-alternatives --install /usr/bin/rapids-parse-cmake-args              rapids-parse-cmake-args             /opt/rapids-build-utils/bin/parse-cmake-args.sh             0;
-update-alternatives --install /usr/bin/rapids-parse-cmake-build-type        rapids-parse-cmake-build-type       /opt/rapids-build-utils/bin/parse-cmake-build-type.sh       0;
-update-alternatives --install /usr/bin/rapids-parse-cmake-var-from-args     rapids-parse-cmake-var-from-args    /opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh    0;
-update-alternatives --install /usr/bin/rapids-parse-cmake-vars-from-args    rapids-parse-cmake-vars-from-args   /opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh   0;
-update-alternatives --install /usr/bin/rapids-python-pkg-roots              rapids-python-pkg-roots             /opt/rapids-build-utils/bin/python-pkg-roots.sh             0;
-update-alternatives --install /usr/bin/rapids-python-pkg-names              rapids-python-pkg-names             /opt/rapids-build-utils/bin/python-pkg-names.sh             0;
-update-alternatives --install /usr/bin/rapids-python-conda-pkg-names        rapids-python-conda-pkg-names       /opt/rapids-build-utils/bin/python-conda-pkg-names.sh       0;
-update-alternatives --install /usr/bin/rapids-get-num-archs-jobs-and-load   rapids-get-num-archs-jobs-and-load  /opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh  0;
-update-alternatives --install /usr/bin/rapids-list-repos                    rapids-list-repos                   /opt/rapids-build-utils/bin/list-repos.sh                   0;
-update-alternatives --install /usr/bin/rapids-query-manifest                rapids-query-manifest               /opt/rapids-build-utils/bin/query-manifest.sh               0;
+install_utility() {
+    local cmd="rapids-${1}";
+    local src="${2:-"${1}.sh"}";
+    # Install alternative
+    update-alternatives --install /usr/bin/${cmd} ${cmd} /opt/rapids-build-utils/bin/${src} 0;
+
+    # Install bash_completion script
+    cat "$(which devcontainer-utils-bash-completion.tmpl)" \
+  | SCRIPT="${cmd}"                                        \
+    NAME="${cmd//-/_}"                                     \
+    envsubst '$SCRIPT $NAME'                               \
+  | tee "/etc/bash_completion.d/${cmd}" >/dev/null         \
+  ;
+}
+
+install_utility update-content-command;
+install_utility post-start-command;
+install_utility post-attach-command;
+
+install_utility checkout-same-branch;
+install_utility pull-repositories;
+install_utility push-repositories;
+install_utility generate-scripts;
+install_utility make-conda-dependencies;
+install_utility make-conda-env;
+install_utility make-pip-dependencies;
+install_utility make-pip-env;
+install_utility make-vscode-workspace;
+install_utility parse-cmake-args;
+install_utility parse-cmake-build-type;
+install_utility parse-cmake-var-from-args;
+install_utility parse-cmake-vars-from-args;
+install_utility python-pkg-roots;
+install_utility python-pkg-names;
+install_utility python-conda-pkg-names;
+install_utility get-num-archs-jobs-and-load;
+install_utility list-repos;
+install_utility query-manifest;
 
 find /opt/rapids-build-utils \
     \( -type d -exec chmod 0775 {} \; \

From bb5909efd8aba0e995147c1159a8c9e6ef0bc4e8 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:00:37 -0800
Subject: [PATCH 029/217] add docstrings for clone-{git,github,gitlab}-repo
 scripts

---
 .../opt/devcontainer/bin/git/repo/clone.sh    | 51 +++++++++++-----
 .../opt/devcontainer/bin/github/repo/clone.sh | 60 +++++++++++++------
 .../opt/devcontainer/bin/gitlab/repo/clone.sh | 60 +++++++++++++------
 3 files changed, 117 insertions(+), 54 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index eb871bff3..7405f4225 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -1,22 +1,38 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  devcontainer-utils-clone-git-repo [OPTION]... <directory>
+#
+# Clone a GitLab repository for the logged in user (as reported by `glab auth status`).
+#
+# If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
+#                               (default: false)
+#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
+#                               (default: false)
+#  --clone-upstream             always clone the upstream, not the user's fork
+#                               (default: false)
+#
+# Options that require values:
+#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#                               (default: `${NAME}.git.tag` in manifest.yaml)
+#  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
+#
+# Positional arguments:
+#  directory                    clone the repo into <directory>
+
+. devcontainer-utils-parse-args-from-docstring;
 
 clone_git_repo() {
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
+    parse_args_or_show_help - <<< "$@";
 
-    local branch="";
-    local upstream="";
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            b|branch                          |
-            u|upstream                        |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    branch="${b:-"${branch:-}"}";
-    upstream="${u:-"${upstream:-}"}";
+    local branch="${b:-"${branch:-}"}";
+    local upstream="${u:-"${upstream:-}"}";
 
     local nargs="${#__rest__[@]}";
     local origin="${__rest__[$((nargs - 2))]}";
@@ -79,7 +95,10 @@ clone_git_repo() {
     git -C "${directory}" submodule update --init --recursive;
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
+if test -n "${devcontainer_utils_debug:-}" \
+&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+  || test -z "${devcontainer_utils_debug##*"clone"*}" \
+  || test -z "${devcontainer_utils_debug##*"clone-git-repo"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index fc2f1e870..c5eb28088 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -1,4 +1,29 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  devcontainer-utils-clone-github-repo [OPTION]... <upstream> <directory>
+#
+# Clone a GitHub repository for the logged in user (as reported by `gh auth status`).
+#
+# If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
+#                               (default: false)
+#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
+#                               (default: false)
+#  --clone-upstream             always clone the upstream, not the user's fork
+#                               (default: false)
+#
+# Options that require values:
+#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#
+# Positional arguments:
+#  upstream                     set <upstream> as the `upstream` remote
+#  directory                    clone the repo into <directory>
+
+. devcontainer-utils-parse-args-from-docstring;
 
 get_default_branch() {
     local repo="${1}";
@@ -56,29 +81,17 @@ ________EOF
 }
 
 clone_github_repo() {
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
-
-    source devcontainer-utils-init-github-cli;
-
-    local branch=;
-    local no_fork=;
-    local clone_upstream=;
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            b|branch                          |
-            no-fork                           |
-            clone-upstream                    |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    parse_args_or_show_help - <<< "$@";
 
     local nargs="${#__rest__[@]}";
     local upstream="${__rest__[$((nargs - 2))]}";
     upstream="${upstream:?upstream is required}";
 
-    branch="${b:-"${branch:-"$(get_default_branch "${upstream}")"}"}";
+    local no_fork="${no_fork:-}";
+    local clone_upstream="${clone_upstream:-}";
+    local branch="${b:-"${branch:-"$(get_default_branch "${upstream}")"}"}";
 
     local directory="${__rest__[$((nargs - 1))]}";
     directory="${directory:?directory is required}";
@@ -92,6 +105,12 @@ clone_github_repo() {
     local fork=;
     local owner=;
 
+    if test -z "${clone_upstream:-}" || \
+      (test -z "${no_fork:-}" && devcontainer-utils-shell-is-interactive); then
+        source devcontainer-utils-init-github-cli;
+        user="${GITHUB_USER:-}";
+    fi
+
     if test -z "${clone_upstream:-}"; then
         name="$(get_repo_name "${upstream}")";
         owner="$(get_repo_owner "${upstream}")";
@@ -133,7 +152,10 @@ clone_github_repo() {
         "${origin}" "${directory}"    ;
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
+if test -n "${devcontainer_utils_debug:-}" \
+&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+  || test -z "${devcontainer_utils_debug##*"clone"*}" \
+  || test -z "${devcontainer_utils_debug##*"clone-github-repo"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 55d1b161c..051cfd2a4 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -1,4 +1,29 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  devcontainer-utils-clone-gitlab-repo [OPTION]... <upstream> <directory>
+#
+# Clone a GitLab repository for the logged in user (as reported by `glab auth status`).
+#
+# If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
+#                               (default: false)
+#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
+#                               (default: false)
+#  --clone-upstream             always clone the upstream, not the user's fork
+#                               (default: false)
+#
+# Options that require values:
+#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#
+# Positional arguments:
+#  upstream                     set <upstream> as the `upstream` remote
+#  directory                    clone the repo into <directory>
+
+. devcontainer-utils-parse-args-from-docstring;
 
 get_default_branch() {
     local repo="${1}";
@@ -82,29 +107,17 @@ get_user_fork_name() {
 }
 
 clone_gitlab_repo() {
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
-
-    source devcontainer-utils-init-gitlab-cli;
-
-    local branch=;
-    local no_fork=;
-    local clone_upstream=;
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            b|branch                          |
-            no-fork                           |
-            clone-upstream                    |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    parse_args_or_show_help - <<< "$@";
 
     local nargs="${#__rest__[@]}";
     local upstream="${__rest__[$((nargs - 2))]}";
     upstream="${upstream:?upstream is required}";
 
-    branch="${b:-"${branch:-"$(get_default_branch "${upstream}")"}"}";
+    local no_fork="${no_fork:-}";
+    local clone_upstream="${clone_upstream:-}";
+    local branch="${b:-"${branch:-"$(get_default_branch "${upstream}")"}"}";
 
     local directory="${__rest__[$((nargs - 1))]}";
     directory="${directory:?directory is required}";
@@ -118,6 +131,12 @@ clone_gitlab_repo() {
     local user=;
     local owner=;
 
+    if test -z "${clone_upstream:-}" || \
+      (test -z "${no_fork:-}" && devcontainer-utils-shell-is-interactive); then
+        source devcontainer-utils-init-gitlab-cli;
+        user="${GITLAB_USER:-}";
+    fi
+
     if test -z "${clone_upstream:-}"; then
         name="$(get_repo_name "${upstream}")";
         owner="$(get_repo_owner "${upstream}")";
@@ -159,7 +178,10 @@ clone_gitlab_repo() {
         "${origin}" "${directory}"    ;
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
+if test -n "${devcontainer_utils_debug:-}" \
+&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+  || test -z "${devcontainer_utils_debug##*"clone"*}" \
+  || test -z "${devcontainer_utils_debug##*"clone-gitlab-repo"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 

From 6de037c445ac07ec38d2d5c436085eb5718e8dfc Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:03:46 -0800
Subject: [PATCH 030/217] format shebangs

---
 .../opt/rapids-build-utils/bin/join-strings.sh      | 12 ------------
 .../opt/rapids-build-utils/bin/parse-cmake-args.sh  |  2 +-
 .../bin/parse-cmake-build-type.sh                   |  2 +-
 .../bin/parse-cmake-var-from-args.sh                |  2 +-
 .../bin/parse-cmake-vars-from-args.sh               | 13 +++++++++++--
 .../opt/rapids-build-utils/bin/parse-valid-args.sh  |  2 +-
 .../rapids-build-utils/bin/post-attach-command.sh   |  2 +-
 .../rapids-build-utils/bin/post-start-command.sh    |  2 +-
 .../bin/update-content-command.sh                   |  2 +-
 9 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/join-strings.sh

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/join-strings.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/join-strings.sh
deleted file mode 100755
index 5eaf82466..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/join-strings.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /usr/bin/env bash
-
-join_with_delimiter() {
-    set -euo pipefail
-    local IFS='' delim=${1:-};
-    shift;
-    echo -n "${1:-}";
-    shift;
-    echo -n "${*/#/$delim}";
-}
-
-(join_with_delimiter "$@");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
index a92c68872..d3d908d11 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 parse_cmake_args() {
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
index 75f1e71ab..3c748f946 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
@@ -1,3 +1,3 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 (rapids-parse-cmake-var-from-args CMAKE_BUILD_TYPE "$@");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
index f818a36de..6433c99d8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 parse_cmake_var_from_args() {
     set -euo pipefail;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
index af6346fcb..d78663ad7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
@@ -1,11 +1,20 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+join_with_delimiter() {
+    set -euo pipefail
+    local IFS='' delim=${1:-};
+    shift;
+    echo -n "${1:-}";
+    shift;
+    echo -n "${*/#/$delim}";
+}
 
 parse_cmake_vars_from_args() {
     set -euo pipefail;
 
     local args="";
     args="$(rapids-parse-cmake-args "$@")";
-    args="$(rapids-join-strings "\n" $args)";
+    args="$(join_with_delimiter "\n" $args)";
     echo -e "$args" \
   | grep '\-D' \
   | sed -r 's/^-D//';
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
index fdf5af287..0a38d9781 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 parse_valid_args() {
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
index a13de1005..d4366187e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_ATTACH_COMMAND:-}"; then
     if test -n "${PYTHON_PACKAGE_MANAGER:-}"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
index 2e2d487fd..c1807f408 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_START_COMMAND:-}"; then
     rapids-make-vscode-workspace --update;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh
index 72b2ac9f7..b1840e552 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_UPDATE_CONTENT_COMMAND:-}"; then
     rapids-generate-scripts;

From e162d06571398b9109589be25c0646137f78c280 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:05:16 -0800
Subject: [PATCH 031/217] add docstrings

---
 .../bin/checkout-same-branch.sh               | 20 ++++++-
 .../bin/get-num-archs-jobs-and-load.sh        | 51 ++++++++++++------
 .../opt/rapids-build-utils/bin/list-repos.sh  | 48 +++++++++++------
 .../bin/make-conda-dependencies.sh            | 45 ++++++++++------
 .../rapids-build-utils/bin/make-conda-env.sh  | 36 ++++++++-----
 .../bin/make-pip-dependencies.sh              | 52 ++++++++++++-------
 .../rapids-build-utils/bin/make-pip-env.sh    | 43 +++++++++------
 .../bin/pull-repositories.sh                  | 28 ++++++++--
 .../bin/push-repositories.sh                  | 28 ++++++++--
 .../bin/python-conda-pkg-names.sh             | 27 +++++++++-
 .../bin/python-pkg-names.sh                   | 21 +++++++-
 .../bin/python-pkg-roots.sh                   | 23 ++++++--
 .../rapids-build-utils/bin/query-manifest.sh  | 35 ++++++++-----
 13 files changed, 334 insertions(+), 123 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index df12dc930..1e51648e7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -1,7 +1,21 @@
 #!/usr/bin/env bash
 
+# Usage:
+#  rapids-checkout-same-branch [OPTION]...
+#
+# Fetch all branches from the origin and upstream remotes,
+# prompts the user to select a branch they all have in common.
+# then checks out all repositories to this common branch.
+#
+# Boolean options:
+#  -h,--help,--usage  print this text
+
+. devcontainer-utils-parse-args-from-docstring;
+
 checkout_same_branch() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
     eval "$(                                  \
         rapids-list-repos "$@"                \
@@ -96,7 +110,9 @@ checkout_same_branch() {
     done;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"checkout-same-branch"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index dc4554bc0..f231923ca 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -1,27 +1,42 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-get-num-archs-jobs-and-load [OPTION]...
+#
+# Compute an appropriate total number of jobs, load, and CUDA archs to build in parallel.
+# This routine scales the input `-j` with respect to the `-a` and `-m` values, taking into account the
+# amount of available system memory (free mem + swap), in order to balance the job and arch parallelism.
+#
+# note: This wouldn't be necessary if `nvcc` interacted with the POSIX jobserver.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+
+. devcontainer-utils-parse-args-from-docstring;
 
 get_num_archs_jobs_and_load() {
     set -euo pipefail
 
-    local archs="";
-    local parallel="";
-    local max_device_obj_memory_usage="";
+    parse_args_or_show_help - <<< "$@";
 
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            a|archs                           |
-            j|parallel                        |
-            m|max-device-obj-memory-usage     |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    archs="${a:-${archs:-}}";
+    local archs="${a:-${archs:-}}";
     archs="${archs//"true"/}";
-    parallel="${j:-${parallel:-}}";
+
+    local parallel="${j:-${parallel:-}}";
     parallel="${parallel//"true"/}";
 
-    max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-}}}";
+    local max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-}}}";
     max_device_obj_memory_usage="${max_device_obj_memory_usage//"true"/}";
     max_device_obj_memory_usage="${max_device_obj_memory_usage:-1}";
 
@@ -77,7 +92,9 @@ ____EOF
     echo "n_load=${n_load}";
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"get-num-archs-jobs-and-load"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 2703f1113..dad6e72c8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -1,34 +1,52 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-list-repos [OPTION]...
+#
+# Query the `manifest.yaml` in a shell-friendly format, optionally filtering results by repository name.
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -r,--repo <repo>      Filter the results to only include <repo> entries.
+#                        (default: all repositories)
+
+. devcontainer-utils-parse-args-from-docstring;
 
 list_repos() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
 
-    local repo=;
+    parse_args_or_show_help - <<< "$@";
 
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            r|repo                            |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    repo="${r:-${repo:-}}";
+    local repos=();
+    repos+=(${r[@]:-}); unset r;
+    repos+=(${repo[@]:-}); unset repo;
+    repos=(${repos[@]:-});
 
     local query=".repos | {repos: .}";
 
-    if test -n "${repo:-}"; then
+    if test ${#repos[@]} -gt 0; then
+        # prefix each element
+        repos=("${repos[@]/#/'.name == "'}");
+        # suffix each element
+        repos=("${repos[@]/%/'" or'}");
         query="$(cat <<________EOF | tr -s '[:space:]'
         .repos
-        | map(select(.name == "${repo}"))
+        | map(select(${repos[@]} false))
         | {repos: .}
 ________EOF
 )";
     fi
 
-    rapids-query-manifest ${__rest__[@]} "${query}";
+    rapids-query-manifest "$@" "${query}";
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"list-repos"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 90b4105b3..2a702ee68 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -1,4 +1,20 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-make-conda-dependencies [OPTION]...
+#
+# Generate a combined conda environment YAML file for all repos.
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#
+# Options that require values:
+#  -k,--key <key>        Only include the key(s)
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  --repo <repo>         Only include dependencies for repo(s).
+
+. devcontainer-utils-parse-args-from-docstring;
 
 generate_env_yaml() {
     (
@@ -9,22 +25,19 @@ generate_env_yaml() {
 }
 
 make_conda_dependencies() {
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
+    parse_args_or_show_help - <<< "$@";
 
     local keys=();
+    keys+=(${k[@]:-}); unset k;
+    keys+=(${key[@]:-}); unset key;
+    keys=(${keys[@]:-all});
 
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            k|keys                            |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    if test -v k; then keys=(${k[@]}); fi
-    if test ${#keys[@]} -eq 0; then
-        keys=(all);
-    fi
+    local repos=();
+    repos+=(${r[@]:-}); unset r;
+    repos+=(${repo[@]:-}); unset repo;
+    repos=(${repos[@]:-});
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
@@ -35,7 +48,7 @@ make_conda_dependencies() {
     local conda_env_yamls=();
 
     eval "$(                                  \
-        rapids-list-repos ${__rest__[@]}      \
+        rapids-list-repos ${repos[@]/#/-r }   \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
@@ -94,7 +107,9 @@ make_conda_dependencies() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-conda-dependencies"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 4d5e53aa2..c2855f404 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -1,20 +1,30 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-make-conda-env [OPTION]...
+#
+# Make a combined conda environment for all repos.
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#  -f,--force            Delete the existing conda env and recreate it from scratch.
+#
+# Options that require values:
+#  -k,--key <key>        Only include the key(s)
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  --repo <repo>         Only include dependencies for repo(s).
+
+. devcontainer-utils-parse-args-from-docstring;
 
 make_conda_env() {
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
+    parse_args_or_show_help - <<< "$@";
 
-    local force=;
     local env_name="${1}";
     local env_file_name="${env_name}.yml";
 
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            f|force                           |
-        ' - <<< "${@:2}"                      \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
     # Remove the current conda env if called with `-f|--force`
     if test -n "${f:-${force:-}}"; then
         rm -rf "$HOME/.conda/envs/${env_name}" \
@@ -24,7 +34,7 @@ make_conda_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.conda/envs/${env_file_name})";
 
-    rapids-make-conda-dependencies ${__rest__[@]} > "${new_env_path}";
+    rapids-make-conda-dependencies "$@" > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 
@@ -58,7 +68,9 @@ make_conda_env() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-conda-env"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index bdd775112..de1c21a90 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -1,4 +1,21 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-make-conda-dependencies [OPTION]...
+#
+# Generate a combined pip requirements file for all repos.
+#
+# Boolean options:
+#  -h,--help,--usage       print this text
+#
+# Options that require values:
+#  -k,--key <key>          Only include the key(s)
+#  -m,--manifest <file>    Use a specific manifest.json
+#                          (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  --repo <repo>           Only include dependencies for repo(s).
+#  -r,--requirement <file> Path(s) to additional requirement files to include.
+
+. devcontainer-utils-parse-args-from-docstring;
 
 generate_requirements() {
     (
@@ -9,27 +26,22 @@ generate_requirements() {
 }
 
 make_pip_dependencies() {
-
     set -Eeuo pipefail;
 
-    local keys=();
-    local requirements=();
+    parse_args_or_show_help - <<< "$@";
 
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            k|keys                            |
-            r|requirement                     |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    local keys=();
+    keys+=(${k[@]:-}); unset k;
+    keys+=(${key[@]:-}); unset key;
+    keys=(${keys[@]:-py_build py_run py_test all});
 
-    if test -v k; then keys=(${k[@]}); fi
-    if test ${#keys[@]} -eq 0; then
-        keys=(py_build py_run py_test all);
-    fi
+    local repos=();
+    repos+=(${repo[@]:-}); unset repo;
+    repos=(${repos[@]:-});
 
-    if test -v r; then requirements+=(${r[@]}); fi
-    if test -v requirement; then requirements+=(${requirement[@]}); fi
+    local requirements=();
+    requirements+=(${r[@]:-}); unset r;
+    requirements+=(${requirement[@]:-}); unset requirement;
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]*' <<< "${cuda_version}")";
@@ -41,7 +53,7 @@ make_pip_dependencies() {
     local pip_reqs_txts=();
 
     eval "$(                                  \
-        rapids-list-repos ${__rest__[@]}      \
+        rapids-list-repos ${repos[@]/#/-r }   \
       | xargs -r -d'\n' -I% echo -n local %\; \
     )";
 
@@ -113,7 +125,9 @@ make_pip_dependencies() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-pip-dependencies"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 397a90815..a72b311b8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -1,20 +1,31 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-make-pip-env [OPTION]...
+#
+# Make a combined pip virtual environment for all repos.
+#
+# Boolean options:
+#  -h,--help,--usage       print this text
+#  -f,--force              Delete the existing pip venv and recreate it from scratch.
+#
+# Options that require values:
+#  -k,--key <key>          Only include the key(s)
+#  --repo <repo>           Only include dependencies for repo(s).
+#  -m,--manifest <file>    Use a specific manifest.json
+#                          (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -r,--requirement <file> Path(s) to additional requirement files to include.
+
+. devcontainer-utils-parse-args-from-docstring;
 
 make_pip_env() {
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
+    parse_args_or_show_help - <<< "$@";
 
-    local force=;
     local env_name="${1}";
     local env_file_name="${env_name}.requirements.txt";
 
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            f|force                           |
-        ' - <<< "${@:2}"                      \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
     # Remove the current virtual env if called with `-f|--force`
     if test -n "${f:-${force:-}}"; then
         rm -rf "$HOME/.local/share/venvs/${env_name}" \
@@ -24,10 +35,10 @@ make_pip_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
-    rapids-make-pip-dependencies ${__rest__[@]} \
-  | (grep -v -E '^$' || [ "$?" == "1" ])        \
-  | tr -s "[:blank:]"                           \
-  | LC_ALL=C sort -u                            \
+    rapids-make-pip-dependencies "$@"    \
+  | (grep -v -E '^$' || [ "$?" == "1" ]) \
+  | tr -s "[:blank:]"                    \
+  | LC_ALL=C sort -u                     \
   > "${new_env_path}"
 
     if test -f "${new_env_path}"; then
@@ -66,7 +77,9 @@ make_pip_env() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-pip-env"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 049d392ee..0a05c415b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -1,7 +1,25 @@
 #!/usr/bin/env bash
 
-checkout_same_branch() {
-    set -euo pipefail;
+# Usage:
+#  rapids-pull-repositories [OPTION]...
+#
+# Pull the latest commits from each repository's upstream remote.
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -r,--repo <repo>      Filter the results to only include <repo> entries.
+#                        (default: all repositories)
+
+. devcontainer-utils-parse-args-from-docstring;
+
+pull_repositories() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
     eval "$(                                  \
         rapids-list-repos "$@"                \
@@ -47,8 +65,10 @@ Please enter a branch name to pull (or leave empty to skip): " branch_name </dev
     done;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"pull-repositories"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(checkout_same_branch "$@");
+(pull_repositories "$@");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index 1f1b99d1d..5130eabd9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -1,7 +1,25 @@
 #!/usr/bin/env bash
 
-checkout_same_branch() {
-    set -euo pipefail;
+# Usage:
+#  rapids-push-repositories [OPTION]...
+#
+# Push the latest commits from each repository to the origin remote.
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -r,--repo <repo>      Filter the results to only include <repo> entries.
+#                        (default: all repositories)
+
+. devcontainer-utils-parse-args-from-docstring;
+
+push_repositories() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
     eval "$(                                  \
         rapids-list-repos "$@"                \
@@ -24,8 +42,10 @@ checkout_same_branch() {
     done;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"push-repositories"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(checkout_same_branch "$@");
+(push_repositories "$@");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index 0ab279955..9cd1ba5e2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -1,11 +1,28 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
+# Usage:
+#  rapids-python-conda-pkg-names [OPTION]...
+#
 # Read the `name="<pkg>"` fields from the meta.yaml files in each repository,
 # as determined by manifest.yaml. This seems to be the most reliable way to
 # determine the actual list of package names to exclude from the combined
 # conda env.
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -r,--repo <repo>      Filter the results to only include <repo> entries.
+#                        (default: all repositories)
+
+. devcontainer-utils-parse-args-from-docstring;
+
 python_conda_pkg_names() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
     eval "$(                                  \
         rapids-list-repos "$@"                \
@@ -35,4 +52,10 @@ python_conda_pkg_names() {
     done
 }
 
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"python-conda-pkg-names"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
 (python_conda_pkg_names "$@");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index dd61aede2..197dc3cc1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -1,8 +1,25 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
+# Usage:
+#  rapids-python-pkg-names [OPTION]...
+#
 # List python package names as determined by manifest.yaml
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -r,--repo <repo>      Filter the results to only include <repo> entries.
+#                        (default: all repositories)
+
+. devcontainer-utils-parse-args-from-docstring;
+
 python_pkg_names() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
     eval "$(                                  \
         rapids-list-repos "$@"                \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index 00ffce50f..9ab763d95 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -1,8 +1,25 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-python-pkg-roots [OPTION]...
+#
+# List python package source dirs as determined by manifest.yaml
+#
+# Boolean options:
+#  -h,--help,--usage     print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -r,--repo <repo>      Filter the results to only include <repo> entries.
+#                        (default: all repositories)
+
+. devcontainer-utils-parse-args-from-docstring;
 
-# List python package roots as determined by manifest.yaml
 python_pkg_roots() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
     eval "$(                                  \
         rapids-list-repos "$@"                \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index e3cb0aabb..e2bb56172 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -1,18 +1,25 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-query-manifest [OPTION]... [QUERY]
+#
+# Query the `manifest.yaml` in a shell-friendly format.
+#
+# Boolean options:
+#  -h,--help,--usage  print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+
+. devcontainer-utils-parse-args-from-docstring;
 
 query_manifest() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
 
-    local manifest=;
+    parse_args_or_show_help - <<< "${@@Q}";
 
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            m|manifest                        |
-        ' - <<< "${@@Q}"                      \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    manifest="${m:-${manifest:-"${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}"}}";
+    local manifest="${m:-${manifest:-"${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}"}}";
 
     local query=;
 
@@ -34,7 +41,7 @@ ________EOF
 )";
 
     query="$(cat <<________EOF | tr -s '[:space:]'
-        ${__rest__[@]}
+        ${__rest__[-1]}
         | ${query}
 ________EOF
 )";
@@ -42,7 +49,9 @@ ________EOF
     yq -Mo json "${manifest}" | jq -r "${query}";
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"query-manifest"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 

From d058b0510a8fb703eba8a8455e38b88c8836d7cb Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:05:37 -0800
Subject: [PATCH 032/217] narrow debug output by script name

---
 .../opt/rapids-build-utils/bin/make-vscode-workspace.sh   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
index 559d281bc..232b7c622 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
@@ -1,4 +1,4 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
 get_repos_ordered() {
     local project_manifest_yml="${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}";
@@ -93,6 +93,12 @@ $(get_repos | with_git_dirs \
 EOF
 }
 
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-vscode-workspace"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
 if echo "$@" | grep -qE '(\-u|\-\-update)'; then
     (make_vscode_workspace "$@" > /tmp/workspace.code-workspace);
     if ! diff -BNqw ~/workspace.code-workspace /tmp/workspace.code-workspace >/dev/null 2>&1; then

From 5cffd0d2fbfdbd371fbdc49faf9479037db93030 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:07:43 -0800
Subject: [PATCH 033/217] don't downcase C++ lib names, generate completions

---
 .../bin/generate-scripts.sh                   | 388 ++++++++++--------
 1 file changed, 210 insertions(+), 178 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 672ca498a..31dac8843 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -1,47 +1,56 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
-TMPL=/opt/rapids-build-utils/bin/tmpl;
-
-TMP_SCRIPT_DIR=/tmp/rapids-build-utils
-mkdir -p $TMP_SCRIPT_DIR
+ALT_SCRIPT_DIR="${ALT_SCRIPT_DIR:-/usr/bin}";
+TEMPLATES="${TEMPLATES:-/opt/rapids-build-utils/bin/tmpl}";
+TMP_SCRIPT_DIR="${TMP_SCRIPT_DIR:-/tmp/rapids-build-utils}";
+COMPLETION_TMPL="${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}";
 
 clean_scripts() {
     set -euo pipefail;
-    for x in $(find $TMP_SCRIPT_DIR -maxdepth 1 -type f -printf '%f\n'); do
-        (sudo update-alternatives --remove-all $x > /dev/null 2>&1);
-    done
-    sudo rm -rf "$TMP_SCRIPT_DIR";
-    mkdir -p $TMP_SCRIPT_DIR
+    mkdir -p "${TMP_SCRIPT_DIR}";
+    find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \; \
+  | xargs -r -I% sudo rm -f "${TMP_SCRIPT_DIR}"/% /etc/bash_completion.d/%;
 }
 
 generate_script() {
     local bin="${1:-}";
-    if test -n "$bin" && ! test -f "$TMP_SCRIPT_DIR/${bin}"; then
+    if test -n "${bin}"; then
         (
-        cat - \
-      | envsubst '$NAME
-                  $SRC_PATH
-                  $PY_ENV
-                  $PY_SRC
-                  $PY_LIB
-                  $CPP_LIB
-                  $CPP_SRC
-                  $CPP_ARGS
-                  $CPP_DEPS
-                  $GIT_TAG
-                  $GIT_REPO
-                  $GIT_HOST
-                  $GIT_UPSTREAM
-                  $PY_CMAKE_ARGS
-                  $PIP_WHEEL_ARGS
-                  $PIP_INSTALL_ARGS' \
-      | sudo tee "$TMP_SCRIPT_DIR/${bin}" >/dev/null;
-
-        sudo chmod +x "$TMP_SCRIPT_DIR/${bin}";
-
-        sudo update-alternatives --install \
-            "/usr/bin/${bin}" "${bin}" "$TMP_SCRIPT_DIR/${bin}" 0 \
-            >/dev/null 2>&1;
+            cat - \
+          | envsubst '$NAME
+                      $SRC_PATH
+                      $PY_ENV
+                      $PY_SRC
+                      $PY_LIB
+                      $CPP_LIB
+                      $CPP_SRC
+                      $CPP_ARGS
+                      $CPP_DEPS
+                      $GIT_TAG
+                      $GIT_REPO
+                      $GIT_HOST
+                      $GIT_UPSTREAM
+                      $PY_CMAKE_ARGS
+                      $PIP_WHEEL_ARGS
+                      $PIP_INSTALL_ARGS' \
+          | tee "${TMP_SCRIPT_DIR}/${bin}" >/dev/null;
+
+            chmod +x "${TMP_SCRIPT_DIR}/${bin}";
+
+            sudo ln -sf "${TMP_SCRIPT_DIR}/${bin}" "${ALT_SCRIPT_DIR}/${bin}";
+
+            if [[ "${bin}" != "${bin,,}" ]]; then
+                sudo ln -sf "${TMP_SCRIPT_DIR}/${bin,,}" "${ALT_SCRIPT_DIR}/${bin,,}";
+            fi
+
+            if test -f "${COMPLETION_TMPL}"; then
+                cat "${COMPLETION_TMPL}"                \
+              | SCRIPT="${bin}"                         \
+                NAME="${bin//-/_}"                      \
+                envsubst '$SCRIPT $NAME'                \
+              | sudo tee "/etc/bash_completion.d/${bin}" >/dev/null;
+            fi
+
         ) & true;
 
         echo "$!"
@@ -49,19 +58,25 @@ generate_script() {
 }
 
 generate_all_script_impl() {
-    local bin="$SCRIPT-all";
-    if test -n "$bin" && ! test -f "$TMP_SCRIPT_DIR/${bin}"; then
+    local bin="${SCRIPT}-all";
+    if test -n "${bin}" && ! test -f "${TMP_SCRIPT_DIR}/${bin}"; then
         (
-        cat - \
-      | envsubst '$NAMES
-                  $SCRIPT' \
-      | sudo tee "$TMP_SCRIPT_DIR/${bin}" >/dev/null;
-
-        sudo chmod +x "$TMP_SCRIPT_DIR/${bin}";
-
-        sudo update-alternatives --install \
-            "/usr/bin/${bin}" "${bin}" "$TMP_SCRIPT_DIR/${bin}" 0 \
-            >/dev/null 2>&1;
+            cat - \
+          | envsubst '$NAMES
+                      $SCRIPT' \
+          | tee "${TMP_SCRIPT_DIR}/${bin}" >/dev/null;
+
+            chmod +x "${TMP_SCRIPT_DIR}/${bin}";
+
+            sudo ln -sf "${TMP_SCRIPT_DIR}/${bin}" "${ALT_SCRIPT_DIR}/${bin}";
+
+            if test -f "${COMPLETION_TMPL}"; then
+                cat "${COMPLETION_TMPL}"                \
+              | SCRIPT="${bin}"                         \
+                NAME="${bin//-/_}"                      \
+                envsubst '$SCRIPT $NAME'                \
+              | sudo tee "/etc/bash_completion.d/${bin}" >/dev/null;
+            fi
         ) & true;
 
         echo "$!"
@@ -69,49 +84,59 @@ generate_all_script_impl() {
 }
 
 generate_all_script() {
-    (
-        cat ${TMPL}/all.tmpl.sh      \
-      | generate_all_script_impl;
+    if test -f "${TEMPLATES}/all.tmpl.sh"; then (
+        cat "${TEMPLATES}/all.tmpl.sh" \
+      | generate_all_script_impl       ;
     ) || true;
+    fi
 }
 
 generate_clone_script() {
-    (
-        cat ${TMPL}/clone.tmpl.sh      \
-      | generate_script "clone-${NAME}";
+    if test -f "${TEMPLATES}/clone.tmpl.sh"; then (
+        cat "${TEMPLATES}/clone.tmpl.sh" \
+      | generate_script "clone-${NAME}"  ;
     ) || true;
+    fi
 }
 
 generate_repo_scripts() {
     local script_name;
-    for script_name in "configure" "build" "clean"; do (
-        cat ${TMPL}/${script_name}.tmpl.sh     \
-      | generate_script "${script_name}-${NAME}";
-    ) || true;
+    for script_name in "configure" "build" "clean"; do
+        if test -f "${TEMPLATES}/${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/${script_name}.tmpl.sh" \
+          | generate_script "${script_name}-${NAME}"  ;
+        ) || true;
+        fi
     done
 }
 
 generate_cpp_scripts() {
     local script_name;
-    for script_name in "configure" "build" "clean" "install" "cpack"; do (
-        cat ${TMPL}/cpp-${script_name}.tmpl.sh         \
-      | CPP_SRC="${SRC_PATH:-}${CPP_SRC:+/$CPP_SRC}"   \
-        generate_script "${script_name}-${CPP_LIB}-cpp";
-    ) || true;
+    for script_name in "clean" "configure" "build" "cpack" "install"; do
+        if test -f "${TEMPLATES}/cpp-${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/cpp-${script_name}.tmpl.sh"  \
+          | CPP_SRC="${SRC_PATH:-}${CPP_SRC:+/$CPP_SRC}"   \
+            generate_script "${script_name}-${CPP_LIB}-cpp";
+        ) || true;
+        fi
     done
 }
 
 generate_python_scripts() {
     local script_name;
-    for script_name in "build" "clean"; do (
-        cat ${TMPL}/python-${script_name}.tmpl.sh        \
-      | generate_script "${script_name}-${PY_LIB}-python";
-    ) || true;
+    for script_name in "build" "clean"; do
+        if test -f "${TEMPLATES}/python-${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/python-${script_name}.tmpl.sh" \
+          | generate_script "${script_name}-${PY_LIB}-python";
+        ) || true;
+        fi
     done
-    for script_name in "editable" "wheel"; do (
-        cat ${TMPL}/python-build-${script_name}.tmpl.sh        \
-      | generate_script "build-${PY_LIB}-python-${script_name}";
-    ) || true;
+    for script_name in "editable" "wheel"; do
+        if test -f "${TEMPLATES}/python-build-${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/python-build-${script_name}.tmpl.sh" \
+          | generate_script "build-${PY_LIB}-python-${script_name}";
+        ) || true;
+        fi
     done
 }
 
@@ -124,8 +149,6 @@ generate_scripts() {
     # Ensure we're in this script's directory
     cd "$( cd "$( dirname "$(realpath -m "${BASH_SOURCE[0]}")" )" && pwd )";
 
-    # PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-
     eval "$(                                  \
         rapids-list-repos "$@"                \
       | xargs -r -d'\n' -I% echo -n local %\; \
@@ -151,121 +174,126 @@ generate_scripts() {
         local git_tag="${repo}_git_tag";
         local git_upstream="${repo}_git_upstream";
 
-        repo_name="$(tr "[:upper:]" "[:lower:]" <<< "${!repo_name:-}")";
+        repo_name="${!repo_name,,}";
+        repo_names+=("${repo_name}");
 
-        repo_names+=($repo_name);
+        local cpp_libs=();
+        local cpp_dirs=();
 
-        # Generate a clone script for each repo
-        (
-            NAME="${repo_name:-}"             \
-            SRC_PATH=~/"${!repo_path:-}"      \
-            GIT_TAG="${!git_tag:-}"           \
-            GIT_REPO="${!git_repo:-}"         \
-            GIT_HOST="${!git_host:-}"         \
-            GIT_UPSTREAM="${!git_upstream:-}" \
-            generate_clone_script             ;
-        ) || true;
+        local py_libs=()
+        local py_dirs=()
 
-        if [[ -d ~/"${!repo_path:-}/.git" ]]; then
+        for ((j=0; j < ${!cpp_length:-0}; j+=1)); do
 
-            local cpp_libs=();
-            local cpp_dirs=();
-
-            for ((j=0; j < ${!cpp_length:-0}; j+=1)); do
-
-                local cpp_name="${repo}_cpp_${j}_name";
-                local cpp_args="${repo}_cpp_${j}_args";
-                local cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
-                local cpp_depends_length="${repo}_cpp_${j}_depends_length";
-                local cpp_path=~/"${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
-
-                cpp_dirs+=("${cpp_path}");
-                cpp_libs+=("${!cpp_name:-}");
-                cpp_name="$(tr "[:upper:]" "[:lower:]" <<< "${!cpp_name:-}")";
-
-                cpp_name_to_path["${cpp_name:-}"]="${cpp_path}";
-
-                local deps=();
-
-                for ((k=0; k < ${!cpp_depends_length:-0}; k+=1)); do
-                    local dep="${repo}_cpp_${j}_depends_${k}";
-                    local dep_cpp_name=$(tr "[:upper:]" "[:lower:]" <<< "${!dep}");
-                    if ! test -v cpp_name_to_path["${dep_cpp_name}"]; then
-                        continue;
-                    fi
-                    local dep_cpp_path="${cpp_name_to_path["${dep_cpp_name}"]}";
-
-                    deps+=(-D${!dep}_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
-                    deps+=(-D$(tr "[:upper:]" "[:lower:]" <<< "${!dep}")_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
-                    deps+=(-D$(tr "[:lower:]" "[:upper:]" <<< "${!dep}")_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
-                done
-
-                (
-                    SRC_PATH=~/"${!repo_path:-}" \
-                    CPP_LIB="${cpp_name:-}"      \
-                    CPP_SRC="${!cpp_sub_dir:-}"  \
-                    CPP_ARGS="${!cpp_args:-}"    \
-                    CPP_DEPS="${deps[@]}"        \
-                    generate_cpp_scripts         ;
-                ) || true;
-            done
+            local cpp_name="${repo}_cpp_${j}_name";
+            local cpp_args="${repo}_cpp_${j}_args";
+            local cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
+            local cpp_depends_length="${repo}_cpp_${j}_depends_length";
+            local cpp_path=~/"${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
 
-            local args=();
-            local deps=();
+            cpp_dirs+=("${cpp_path}");
+            cpp_libs+=("${!cpp_name:-}");
+            cpp_name="${!cpp_name:-}";
+            cpp_name_lower="${cpp_name,,}";
 
-            for ((k=0; k < ${#cpp_libs[@]}; k+=1)); do
-                # Define both lowercase and uppercase
-                # `-DFIND_<lib>_CPP=ON` and `-DFIND_<LIB>_CPP=ON` because the RAPIDS
-                # scikit-build CMakeLists.txt's aren't 100% consistent in the casing
-                local cpp_dir="${cpp_dirs[$k]}";
-                local cpp_lib="${cpp_libs[$k]}";
-                args+=(-DFIND_${cpp_lib}_CPP=ON);
-                args+=(-DFIND_$(tr "[:upper:]" "[:lower:]" <<< "${cpp_lib}")_CPP=ON);
-                args+=(-DFIND_$(tr "[:lower:]" "[:upper:]" <<< "${cpp_lib}")_CPP=ON);
-                deps+=(-D${cpp_lib}_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
-                deps+=(-D$(tr "[:upper:]" "[:lower:]" <<< "${cpp_lib}")_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
-                deps+=(-D$(tr "[:lower:]" "[:upper:]" <<< "${cpp_lib}")_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
-            done
+            cpp_name_to_path["${cpp_name}"]="${cpp_path}";
 
-            local py_libs=()
-            local py_dirs=()
-
-            for ((j=0; j < ${!py_length:-0}; j+=1)); do
-                local py_env="${repo}_python_${j}_env";
-                local py_name="${repo}_python_${j}_name";
-                local py_cmake_args="${repo}_python_${j}_args_cmake";
-                local pip_wheel_args="${repo}_python_${j}_args_wheel";
-                local pip_install_args="${repo}_python_${j}_args_install";
-                local py_sub_dir="${repo}_python_${j}_sub_dir";
-                local py_depends_length="${repo}_python_${j}_depends_length";
-                local py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
-
-                py_libs+=(${!py_name});
-
-                (
-                    PY_SRC="${py_path}"                       \
-                    PY_LIB="${!py_name}"                      \
-                    PY_ENV="${!py_env:-}"                     \
-                    CPP_ARGS="${args[@]}"                     \
-                    CPP_DEPS="${deps[@]}"                     \
-                    PY_CMAKE_ARGS="${!py_cmake_args:-}"       \
-                    PIP_WHEEL_ARGS="${!pip_wheel_args:-}"     \
-                    PIP_INSTALL_ARGS="${!pip_install_args:-}" \
-                    generate_python_scripts                   ;
-                ) || true;
-            done;
-
-            for ((k=0; k < ${#cpp_libs[@]}; k+=1)); do
-                cpp_libs[$k]="$(tr "[:upper:]" "[:lower:]" <<< "${cpp_libs[$k]}")";
+            local deps=();
+
+            for ((k=0; k < ${!cpp_depends_length:-0}; k+=1)); do
+                local dep="${repo}_cpp_${j}_depends_${k}";
+                local dep_cpp_name="${!dep}";
+                if ! test -v cpp_name_to_path["${dep_cpp_name}"]; then
+                    continue;
+                fi
+                local dep_cpp_path="${cpp_name_to_path["${dep_cpp_name}"]}";
+
+                deps+=(-D${!dep}_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
+                deps+=(-D${!dep,,}_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
+                deps+=(-D${!dep^^}_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
             done
 
+            if [[ -d ~/"${!repo_path:-}/.git" ]]; then
+            (
+                SRC_PATH=~/"${!repo_path:-}" \
+                CPP_LIB="${cpp_name:-}"      \
+                CPP_SRC="${!cpp_sub_dir:-}"  \
+                CPP_ARGS="${!cpp_args:-}"    \
+                CPP_DEPS="${deps[@]}"        \
+                generate_cpp_scripts         ;
+            ) || true;
+            fi
+        done
+
+        local args=();
+        local deps=();
+
+        for ((k=0; k < ${#cpp_libs[@]}; k+=1)); do
+            # Define both lowercase and uppercase
+            # `-DFIND_<lib>_CPP=ON` and `-DFIND_<LIB>_CPP=ON` because the RAPIDS
+            # scikit-build CMakeLists.txt's aren't 100% consistent in the casing
+            local cpp_dir="${cpp_dirs[$k]}";
+            local cpp_lib="${cpp_libs[$k]}";
+            args+=(-DFIND_${cpp_lib}_CPP=ON);
+            args+=(-DFIND_${cpp_lib,,}_CPP=ON);
+            args+=(-DFIND_${cpp_lib^^}_CPP=ON);
+            deps+=(-D${cpp_lib}_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
+            deps+=(-D${cpp_lib,,}_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
+            deps+=(-D${cpp_lib^^}_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
+        done
+
+        for ((j=0; j < ${!py_length:-0}; j+=1)); do
+            local py_env="${repo}_python_${j}_env";
+            local py_name="${repo}_python_${j}_name";
+            local py_cmake_args="${repo}_python_${j}_args_cmake";
+            local pip_wheel_args="${repo}_python_${j}_args_wheel";
+            local pip_install_args="${repo}_python_${j}_args_install";
+            local py_sub_dir="${repo}_python_${j}_sub_dir";
+            local py_depends_length="${repo}_python_${j}_depends_length";
+            local py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
+
+            py_dirs+=("${py_path}");
+            py_libs+=("${!py_name}");
+
+            if [[ -d ~/"${!repo_path:-}/.git" ]]; then
             (
-                NAME="${repo_name:-}"    \
-                PY_LIB="${py_libs[@]}"   \
-                CPP_LIB="${cpp_libs[@]}" \
-                generate_repo_scripts    ;
+                SRC_PATH=~/"${!repo_path:-}"              \
+                PY_SRC="${py_path}"                       \
+                PY_LIB="${!py_name}"                      \
+                PY_ENV="${!py_env:-}"                     \
+                CPP_ARGS="${args[@]}"                     \
+                CPP_DEPS="${deps[@]}"                     \
+                PY_CMAKE_ARGS="${!py_cmake_args:-}"       \
+                PIP_WHEEL_ARGS="${!pip_wheel_args:-}"     \
+                PIP_INSTALL_ARGS="${!pip_install_args:-}" \
+                generate_python_scripts                   ;
             ) || true;
+            fi
+        done;
+
+        if [[ -d ~/"${!repo_path:-}/.git" ]]; then
+        (
+            NAME="${repo_name:-}"    \
+            PY_LIB="${py_libs[@]}"   \
+            CPP_LIB="${cpp_libs[@]}" \
+            generate_repo_scripts    ;
+        ) || true;
         fi
+
+        # Generate a clone script for each repo
+        (
+            NAME="${repo_name:-}"             \
+            SRC_PATH=~/"${!repo_path:-}"      \
+            PY_LIB="${py_libs[@]}"            \
+            PY_SRC="${py_dirs[@]}"            \
+            CPP_LIB="${cpp_libs[@]}"          \
+            CPP_SRC="${cpp_dirs[@]}"          \
+            GIT_TAG="${!git_tag:-}"           \
+            GIT_REPO="${!git_repo:-}"         \
+            GIT_HOST="${!git_host:-}"         \
+            GIT_UPSTREAM="${!git_upstream:-}" \
+            generate_clone_script             ;
+        ) || true;
     done
 
     sudo find /opt/rapids-build-utils \
@@ -274,7 +302,7 @@ generate_scripts() {
 
     unset cpp_name_to_path;
 
-    for script in "clone" "clean" "configure" "build"; do
+    for script in "clone" "clean" "configure" "build" "cpack" "install"; do
         # Generate a script to run a script for all repos
         (
             NAMES="${repo_names[@]}" \
@@ -284,11 +312,15 @@ generate_scripts() {
     done;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"generate-scripts"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(clean_scripts);
+clean_scripts;
+
+rm -rf "${TMP_SCRIPT_DIR}"/*;
 
 for pid in $(generate_scripts "$@"); do
     while [[ -e "/proc/$pid" ]]; do

From 9c9340db0261af764ee45fec439dd77f0b0a1e0e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:12:31 -0800
Subject: [PATCH 034/217] add docstrings

---
 .../rapids-build-utils/bin/tmpl/all.tmpl.sh   |  23 ++-
 .../rapids-build-utils/bin/tmpl/build.tmpl.sh |  36 +++--
 .../rapids-build-utils/bin/tmpl/clean.tmpl.sh |  21 ++-
 .../rapids-build-utils/bin/tmpl/clone.tmpl.sh |  62 ++++----
 .../bin/tmpl/configure.tmpl.sh                |  36 ++++-
 .../bin/tmpl/cpp-build.tmpl.sh                |  49 ++++---
 .../bin/tmpl/cpp-clean.tmpl.sh                |  23 ++-
 .../bin/tmpl/cpp-configure.tmpl.sh            |  65 +++++----
 .../bin/tmpl/cpp-cpack.tmpl.sh                |  39 ++++--
 .../bin/tmpl/cpp-install.tmpl.sh              |  24 +++-
 .../bin/tmpl/python-build-editable.tmpl.sh    |  84 +++++------
 .../bin/tmpl/python-build-wheel.tmpl.sh       | 132 ++++++++++--------
 .../bin/tmpl/python-build.tmpl.sh             |  34 +++--
 .../bin/tmpl/python-clean.tmpl.sh             |  33 +++--
 14 files changed, 427 insertions(+), 234 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
index 8e33cec52..f5ac0d392 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
@@ -1,5 +1,22 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  ${SCRIPT}-all [OPTION]...
+#
+# Runs the ${SCRIPT} in each ${NAMES}.
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+
+. devcontainer-utils-parse-args-from-docstring;
+
 ${SCRIPT}_all() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
     for name in ${NAMES}; do
         if type ${SCRIPT}-${name} >/dev/null 2>&1; then
@@ -8,7 +25,9 @@ ${SCRIPT}_all() {
     done
 }
 
-if [[ -n "${rapids_build_utils_debug:-}" ]]; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"${SCRIPT}-all"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
index 9cc2fdec4..2aab58c90 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
@@ -1,33 +1,41 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
-build_${NAME}() {
-    set -euo pipefail;
+# Usage:
+#  build-${PY_LIB} [OPTION]...
+#
+# Configure and build ${CPP_LIB}, then build an editable install or wheel of ${PY_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+#
+# Options that require values:
+#  -t,--type editable|wheel               The type of Python build to run (editable or wheel)
+#                                         (default: editable)
 
-    local mode="editable";
+. devcontainer-utils-parse-args-from-docstring;
 
-    # pull out the --mode editable|wheel arg (if any)
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            m|mode                            |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+build_${NAME}() {
+    set -Eeuo pipefail;
 
-    mode="${m:-${mode:-"editable"}}";
+    parse_args_or_show_help - <<< "$@";
 
     for lib in ${CPP_LIB}; do
         if type build-${lib}-cpp >/dev/null 2>&1; then
             build-${lib}-cpp ${__rest__[@]};
         fi
     done
+
     for lib in ${PY_LIB}; do
         if type build-${lib}-python >/dev/null 2>&1; then
-            build-${lib}-python -m ${mode} ${__rest__[@]};
+            build-${lib}-python --type ${t:-${type:-"editable"}} ${__rest__[@]};
         fi
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${NAME}"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clean.tmpl.sh
index 611222178..ed66235e0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clean.tmpl.sh
@@ -1,7 +1,20 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  clean-${NAME} [OPTION]...
+#
+# Clean the ${NAME} repository.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+
+. devcontainer-utils-parse-args-from-docstring;
 
 clean_${NAME}() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
     for lib in ${CPP_LIB}; do
         if type clean-${lib}-cpp >/dev/null 2>&1; then
             clean-${lib}-cpp "$@";
@@ -14,7 +27,9 @@ clean_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-${NAME}"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
index 8e569a9be..d31e234ab 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
@@ -1,32 +1,42 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
-clone_${NAME}() {
-    set -euo pipefail;
+# Usage:
+#  clone-${NAME}-cpp [OPTION]...
+#
+# Clone the ${NAME} repository.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
+#                               (default: false)
+#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
+#                               (default: false)
+#  --clone-upstream             always clone the upstream, not the user's fork
+#                               (default: false)
+#
+# Options that require values:
+#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#                               (default: `${NAME}.git.tag` in manifest.yaml)
+#  -d,--directory <dir>         clone the repo into <dir>
+#                               (default: `${NAME}.path` in manifest.yaml)
+#  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
+#                               (default: `${NAME}.git.upstream` in manifest.yaml)
 
-    if [[ ! -d "${SRC_PATH}"/.git ]]; then
+. devcontainer-utils-parse-args-from-docstring;
 
-        local branch=;
-        local upstream=;
-        local directory=;
-        local no_fork=;
-        local clone_upstream=;
-        local no_update_env=;
+clone_${NAME}() {
+    set -Eeuo pipefail;
 
-        eval "$(                                  \
-            devcontainer-utils-parse-args --names '
-                b|branch                          |
-                d|directory                       |
-                u|upstream                        |
-                no-fork                           |
-                clone-upstream                    |
-                no-update-env                     |
-            ' - <<< "$@"                          \
-          | xargs -r -d'\n' -I% echo -n local %\; \
-        )";
+    parse_args_or_show_help - <<< "$@";
+
+    if [[ ! -d "${SRC_PATH}"/.git ]]; then
 
-        branch="${b:-${branch:-"${GIT_TAG}"}}";
-        directory="${d:-${directory:-"${SRC_PATH}"}}";
-        upstream="${u:-${upstream:-"${GIT_UPSTREAM}/${GIT_REPO}"}}";
+        local no_fork="${no_fork:-}";
+        local no_update_env="${no_update_env:-}";
+        local clone_upstream="${clone_upstream:-}";
+        local branch="${b:-${branch:-"${GIT_TAG}"}}";
+        local directory="${d:-${directory:-"${SRC_PATH}"}}";
+        local upstream="${u:-${upstream:-"${GIT_UPSTREAM}/${GIT_REPO}"}}";
 
         echo 'Cloning ${NAME}' 1>&2;
 
@@ -59,7 +69,9 @@ clone_${NAME}() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clone-${NAME}"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh
index 8062c3346..b0af00960 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh
@@ -1,7 +1,35 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  configure-${CPP_LIB} [OPTION]...
+#
+# Runs the configure script in each ${CPP_LIB}.
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+
+. devcontainer-utils-parse-args-from-docstring;
 
 configure_${NAME}() {
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
     for lib in ${CPP_LIB}; do
         if type configure-${lib}-cpp >/dev/null 2>&1; then
             configure-${lib}-cpp "$@";
@@ -9,7 +37,9 @@ configure_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-${NAME}"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
index 4d0def9be..931e22ba1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
@@ -1,29 +1,44 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  build-${CPP_LIB}-cpp [OPTION]...
+#
+# Configure and build ${CPP_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+#  -D* <var>[:<type>]=<value>   Create or update a cmake cache entry.
+
+. devcontainer-utils-parse-args-from-docstring;
 
 build_${CPP_LIB}_cpp() {
-
     set -Eeuo pipefail;
 
+    parse_args_or_show_help - <<< "$@";
+
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
     fi
 
-    local verbose="";
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            v|verbose                         |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    verbose="${v:-${verbose:-}}";
+    local verbose="${v:-${verbose:-}}";
 
     configure-${CPP_LIB}-cpp ${verbose:+-v} ${__rest__[@]};
 
-    eval "$(                                              \
-        rapids-get-num-archs-jobs-and-load ${__rest__[@]} \
-      | xargs -r -d'\n' -I% echo -n local %\;             \
+    eval "$(                                    \
+        rapids-get-num-archs-jobs-and-load "$@" \
+      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
     # Build C++ lib
@@ -38,7 +53,9 @@ build_${CPP_LIB}_cpp() {
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${CPP_LIB}-cpp"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
index f25c83766..b86d39846 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
@@ -1,14 +1,31 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  clean-${CPP_LIB}-cpp [OPTION]...
+#
+# Clean the ${CPP_LIB} build dirs.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+
+. devcontainer-utils-parse-args-from-docstring;
 
 clean_${CPP_LIB}_cpp() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
 
-    set -euo pipefail;
+    if [[ ! -d "${CPP_SRC}" ]]; then
+        exit 1;
+    fi
 
     rm -rf "${CPP_SRC}/build/latest"/* \
            "${CPP_SRC}"/compile_commands.json;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-${CPP_LIB}-cpp"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
index 9b53e5e1f..7f195c349 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
@@ -1,41 +1,42 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  configure-${CPP_LIB}-cpp [OPTION]...
+#
+# Configure ${CPP_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+
+. devcontainer-utils-parse-args-from-docstring;
 
 configure_${CPP_LIB}_cpp() {
-
     set -Eeuo pipefail;
 
+    parse_args_or_show_help - <<< "$@";
+
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
     fi
 
-    local archs="";
-    local parallel="";
-    local max_device_obj_memory_usage="";
-
-    local verbose="";
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            a|archs                           |
-            j|parallel                        |
-            m|max-device-obj-memory-usage     |
-            v|verbose                         |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    verbose="${v:-${verbose:-}}";
-
-    archs="${a:-${archs:-}}";
-    parallel="${j:-${parallel:-}}";
-    max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-}}";
+    local verbose="${v:-${verbose:-}}";
 
-    eval "$(                                                                    \
-        rapids-get-num-archs-jobs-and-load                                      \
-            ${archs:+-a ${archs}}                                               \
-            ${parallel:+-j ${parallel}}                                         \
-            ${max_device_obj_memory_usage:+-m ${max_device_obj_memory_usage}}   \
-      | xargs -r -d'\n' -I% echo -n local %\;                                   \
+    eval "$(                                    \
+        rapids-get-num-archs-jobs-and-load "$@" \
+      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
     local build_type="$(rapids-parse-cmake-build-type ${__rest__[@]} | tr '[:upper:]' '[:lower:]')";
@@ -60,7 +61,7 @@ configure_${CPP_LIB}_cpp() {
     cmake_args+=(${__rest__[@]});
 
     time (
-        CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
+        CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t${n_arch}" \
             cmake ${cmake_args[@]};
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} configure time:";
     ) 2>&1;
@@ -75,7 +76,9 @@ configure_${CPP_LIB}_cpp() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-${CPP_LIB}-cpp"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
index ee6909acb..bdf78fb37 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
@@ -1,21 +1,27 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  cpack-${CPP_LIB}-cpp [OPTION]...
+#
+# CPack ${CPP_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+# Options that require values:
+#  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
+#                               (default: none)
+
+. devcontainer-utils-parse-args-from-docstring;
 
 cpack_${CPP_LIB}_cpp() {
-
     set -Eeuo pipefail;
 
-    local verbose="";
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            v|verbose                         |
-            o|out-dir                         |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    parse_args_or_show_help - <<< "$@";
 
-    verbose="${v:-${verbose:-}}";
-    out_dir="${o:-${out_dir:-}}";
+    local verbose="${v:-${verbose:-}}";
+    local out_dir="${o:-${out_dir:-}}";
 
     time (
         (
@@ -26,14 +32,17 @@ cpack_${CPP_LIB}_cpp() {
         if test -d "${out_dir}"/; then
             find "${CPP_SRC}"/build/latest/     \
                 -iname "${CPP_LIB}-*.tar.gz"    \
-                -exec cp -a "{}" "${out_dir}"/ \;
+                -print0                         \
+          | xargs -0 -I% cp -a "%" "${out_dir}"/;
         fi
 
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} CPack time:";
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"cpack-${CPP_LIB}-cpp"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
index bee264bb4..121cf9f1e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
@@ -1,16 +1,34 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
-install_${CPP_LIB}_cpp() {
+# Usage:
+#  install-${CPP_LIB}-cpp [OPTION]...
+#
+# Install ${CPP_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+# Options that require values:
+#  -p,--prefix <dir>            install C++ library into <dir>
+#                               (default: none)
+
+. devcontainer-utils-parse-args-from-docstring;
 
+install_${CPP_LIB}_cpp() {
     set -Eeuo pipefail;
 
+    parse_args_or_show_help - <<< "$@";
+
     time (
         cmake --install "${CPP_SRC}"/build/latest/ "$@";
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} install time:";
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
index 228aca4b2..e44267b39 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
@@ -1,42 +1,41 @@
-#! /usr/bin/env bash
-
-build_${PY_LIB}_python_inplace() {
-
+#!/usr/bin/env bash
+
+# Usage:
+#  build-${PY_LIB}-python-editable [OPTION]...
+#
+# Build ${PY_LIB} in editable mode.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+
+. devcontainer-utils-parse-args-from-docstring;
+
+build_${PY_LIB}_python_editable() {
     set -Eeuo pipefail;
 
+    parse_args_or_show_help - <<< "$@";
+
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
     fi
 
-    local archs="";
-    local parallel="";
-    local max_device_obj_memory_usage="";
+    local verbose="${v:-${verbose:-}}";
 
-    local verbose="";
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            a|archs                           |
-            j|parallel                        |
-            m|max-device-obj-memory-usage     |
-            v|verbose                         |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    verbose="${v:-${verbose:-}}";
-    config_settings="${C:-${config_settings:-}}";
-
-    archs="${a:-${archs:-}}";
-    parallel="${j:-${parallel:-}}";
-    max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-}}";
-
-    eval "$(                                                                    \
-        rapids-get-num-archs-jobs-and-load                                      \
-            ${archs:+-a ${archs}}                                               \
-            ${parallel:+-j ${parallel}}                                         \
-            ${max_device_obj_memory_usage:+-m ${max_device_obj_memory_usage}}   \
-      | xargs -r -d'\n' -I% echo -n local %\;                                   \
+    eval "$(                                    \
+        rapids-get-num-archs-jobs-and-load "$@" \
+      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
     local cmake_args=(${PY_CMAKE_ARGS});
@@ -48,8 +47,11 @@ build_${PY_LIB}_python_inplace() {
     cmake_args+=(${__rest__[@]});
 
     local ninja_args=();
+    local pip_args=(${PIP_INSTALL_ARGS});
+
     if test -n "${verbose}"; then
         ninja_args+=("-v");
+        pip_args+=("-vv");
     fi
 
     if test -n "${n_jobs}"; then
@@ -60,12 +62,6 @@ build_${PY_LIB}_python_inplace() {
         ninja_args+=("-l${n_load}");
     fi
 
-    local pip_args=(${PIP_INSTALL_ARGS});
-
-    if test -n "${verbose}"; then
-        pip_args+=("-vv");
-    fi
-
     pip_args+=("--no-build-isolation");
     pip_args+=("--no-deps");
     pip_args+=("--editable");
@@ -78,11 +74,12 @@ build_${PY_LIB}_python_inplace() {
     time (
         export ${PY_ENV} PATH="$PATH";
 
-        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
-        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
+        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t${n_arch}";
+        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t${n_arch}";
 
         CUDAFLAGS="${cudaflags}"                     \
         CMAKE_GENERATOR="Ninja"                      \
+        PARALLEL_LEVEL="${n_jobs}"                   \
         CMAKE_ARGS="${cmake_args[@]}"                \
         SKBUILD_BUILD_OPTIONS="${ninja_args[@]}"     \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
@@ -93,8 +90,11 @@ build_${PY_LIB}_python_inplace() {
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-editable"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-build_${PY_LIB}_python_inplace "$@";
+build_${PY_LIB}_python_editable "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
index 4e7a15470..6ed634982 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
@@ -1,52 +1,64 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  build-${PY_LIB}-python-wheel [OPTION]...
+#
+# Build a ${PY_LIB} wheel.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+#  --no-clean                             Don't clean up build directories.
+#  --no-deps                              Don't install package dependencies.
+#  --no-verify                            Don't verify if built wheel is valid.
+#  --no-cache-dir                         Disable the pip cache.
+#  --use-pep517                           Use PEP 517 for building source distributions.
+#  --no-use-pep517                        Don't use PEP 517 for building source distributions
+#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
+#                                         dependencies specified by PEP 518 must be already installed if this option is
+#                                         used.
+#  --pre                                  Include pre-release and development versions. By default, pip only finds
+#                                         stable versions.
+#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
+#                                         newer.
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+#  --cache-dir <dir>                      Store the cache data in <dir>.
+#  --ignore-requires-python               Ignore the Requires-Python information.
+#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
+#                                         adds to the existing value. Accepts either ":all:" to disable all source
+#                                         packages, ":none:" to empty the set, or one or more package names with commas
+#                                         between them. Packages without binary distributions will fail to install when
+#                                         this option is used on them.
+#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
+#                                         (default: none)
+
+. devcontainer-utils-parse-args-from-docstring;
 
 build_${PY_LIB}_python_wheel() {
-
     set -Eeuo pipefail;
 
+    parse_args_or_show_help - <<< "$@";
+
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
     fi
 
-    local archs="";
-    local parallel="";
-    local max_device_obj_memory_usage="";
-
-    local verbose="";
-    local wheel_dir="";
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            a|archs                           |
-            j|parallel                        |
-            m|max-device-obj-memory-usage     |
-            v|verbose                         |
-            w|wheel-dir                       |
-            prefer-binary                     |
-            only-binary                       |
-            no-deps                           |
-            no-clean                          |
-            no-verify                         |
-            no-cache-dir                      |
-            no-use-pep517                     |
-            no-build-isolation                |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
-
-    verbose="${v:-${verbose:-}}";
-    wheel_dir="${w:-${wheel_dir:-}}";
+    local verbose="${v:-${verbose:-}}";
+    local wheel_dir="${w:-${wheel_dir:-}}";
 
-    archs="${a:-${archs:-}}";
-    parallel="${j:-${parallel:-}}";
-    max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-}}";
-
-    eval "$(                                                                    \
-        rapids-get-num-archs-jobs-and-load                                      \
-            ${archs:+-a ${archs}}                                               \
-            ${parallel:+-j ${parallel}}                                         \
-            ${max_device_obj_memory_usage:+-m ${max_device_obj_memory_usage}}   \
-      | xargs -r -d'\n' -I% echo -n local %\;                                   \
+    eval "$(                                    \
+        rapids-get-num-archs-jobs-and-load "$@" \
+      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
     local cmake_args=(${PY_CMAKE_ARGS});
@@ -62,9 +74,11 @@ build_${PY_LIB}_python_wheel() {
     cmake_args+=(${__rest__[@]});
 
     local ninja_args=();
+    local pip_args=(${PIP_WHEEL_ARGS});
 
     if test -n "${verbose}"; then
         ninja_args+=("-v");
+        pip_args+=("-vv");
     fi
 
     if test -n "${n_jobs}"; then
@@ -75,27 +89,22 @@ build_${PY_LIB}_python_wheel() {
         ninja_args+=("-l${n_load}");
     fi
 
-    local pip_args=(${PIP_WHEEL_ARGS});
-
-    if test -n "${verbose}"; then
-        pip_args+=("-vv");
+    if test -n "${pre:-}"; then
+        pip_args+=("--pre");
     fi
 
     if test -n "${wheel_dir:-}"; then
-        pip_args+=("-w" "${wheel_dir}");
+        pip_args+=("--wheel-dir" "${wheel_dir}");
     fi
 
     if test -n "${prefer_binary:-}"; then
         pip_args+=("--prefer-binary");
-        if [ "${prefer_binary:-}" != "true" ]; then
-            pip_args+=("${prefer_binary:-}");
-        fi
     fi
 
-    if test -n "${only_binary:-}"; then
+    if test -n "${only_binary[@]:-}"; then
         pip_args+=("--only-binary");
-        if [ "${only_binary:-}" != "true" ]; then
-            pip_args+=("${only_binary:-}");
+        if [ "${only_binary[@]}" != "true" ]; then
+            pip_args+=("${only_binary[@]}");
         fi
     fi
 
@@ -111,11 +120,15 @@ build_${PY_LIB}_python_wheel() {
         pip_args+=("--no-verify");
     fi
 
-    if test -n "${no_cache_dir:-}"; then
+    if test -n "${cache_dir:-}"; then
+        pip_args+=("--cache-dir" "${cache_dir:-}");
+    elif test -n "${no_cache_dir:-}"; then
         pip_args+=("--no-cache-dir");
     fi
 
-    if test -n "${no_use_pep517:-}"; then
+    if test -n "${use_pep517:-}"; then
+        pip_args+=("--use-pep517");
+    elif test -n "${no_use_pep517:-}"; then
         pip_args+=("--no-use-pep517");
     fi
 
@@ -123,6 +136,10 @@ build_${PY_LIB}_python_wheel() {
         pip_args+=("--no-build-isolation");
     fi
 
+    if test -n "${ignore_requires_python:-}"; then
+        pip_args+=("--ignore-requires-python");
+    fi
+
     pip_args+=("${PY_SRC}");
 
     trap "rm -rf '${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
@@ -130,8 +147,8 @@ build_${PY_LIB}_python_wheel() {
     time (
         export ${PY_ENV} PATH="$PATH";
 
-        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
-        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
+        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t${n_arch}";
+        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t${n_arch}";
 
         CUDAFLAGS="${cudaflags}"                 \
         CMAKE_GENERATOR="Ninja"                  \
@@ -145,7 +162,10 @@ build_${PY_LIB}_python_wheel() {
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-wheel"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build.tmpl.sh
index 5326023c5..579e23118 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build.tmpl.sh
@@ -1,23 +1,31 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
-build_${PY_LIB}_python() {
+# Usage:
+#  build-${PY_LIB}-python [OPTION]...
+#
+# Build an editable install or wheel of ${PY_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+#
+# Options that require values:
+#  -t,--type editable|wheel               The type of Python build to run (editable or wheel)
+#                                         (default: editable)
 
-    local mode="editable";
+. devcontainer-utils-parse-args-from-docstring;
 
-    # pull out the --mode editable|wheel arg (if any)
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            m|mode                            |
-        ' - <<< "$@"                          \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+build_${PY_LIB}_python() {
+    set -Eeuo pipefail;
 
-    mode="${m:-${mode:-"editable"}}";
+    parse_args_or_show_help - <<< "$@";
 
-    build-${PY_LIB}-python-${mode} ${__rest__[@]};
+    build-${PY_LIB}-python-${t:-${type:-"editable"}} ${__rest__[@]};
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
index 22d7f0bee..ed8279d6c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
@@ -1,8 +1,23 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
 
-clean_${PY_LIB}_cpp() {
+# Usage:
+#  clean-${PY_LIB}-python [OPTION]...
+#
+# Clean the ${PY_LIB} build dirs.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
 
-    set -euo pipefail;
+. devcontainer-utils-parse-args-from-docstring;
+
+clean_${PY_LIB}_python() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    if [[ ! -d "${PY_SRC}" ]]; then
+        exit 1;
+    fi
 
     local py_lib="${PY_LIB}";
 
@@ -22,17 +37,19 @@ clean_${PY_LIB}_cpp() {
 
     if test -d "${PY_SRC}"/build; then
         local slug="$(uname -s)-$(uname -m)";
-        rm -rf                                                                                        \
-            `# scikit-buld-core build dirs`                                                           \
+        rm -rf                                                                                      \
+            `# scikit-buld-core build dirs`                                                         \
             "${PY_SRC}"/build/cp{${py_ver},${py_ver/./}}-cp{${py_ver},${py_ver/./}}*                \
-            `# setuptools/distutils build dirs`                                                       \
+            `# setuptools/distutils build dirs`                                                     \
             "${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}                                       \
             "${PY_SRC}"/build/{lib,temp,dist,bdist}.${slug,,}-{,cpython}{,-}{${py_ver},${py_ver/./}};
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}"; then
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-${PY_LIB}-python"*}" ); then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-clean_${PY_LIB}_cpp "$@";
+clean_${PY_LIB}_python "$@";

From 58493006a37a9c1cebd25fe4353087d4de45587d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:38:08 -0800
Subject: [PATCH 035/217] add --omit to rapids-list-repos

---
 .../opt/rapids-build-utils/bin/list-repos.sh  | 29 ++++++++++++++-----
 .../bin/make-conda-dependencies.sh            |  3 ++
 .../rapids-build-utils/bin/make-conda-env.sh  |  3 ++
 .../bin/make-pip-dependencies.sh              |  3 ++
 .../rapids-build-utils/bin/make-pip-env.sh    |  5 +++-
 .../bin/pull-repositories.sh                  |  2 ++
 .../bin/push-repositories.sh                  |  2 ++
 .../bin/python-conda-pkg-names.sh             |  2 ++
 .../bin/python-pkg-names.sh                   |  2 ++
 .../bin/python-pkg-roots.sh                   |  2 ++
 10 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index dad6e72c8..3c04ffb1c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -11,7 +11,9 @@
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -r,--repo <repo>      Filter the results to only include <repo> entries.
+#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
+#                        (default: none)
+#  -r,--repo <repo>      Filter the results to include <repo> entries.
 #                        (default: all repositories)
 
 . devcontainer-utils-parse-args-from-docstring;
@@ -26,19 +28,32 @@ list_repos() {
     repos+=(${repo[@]:-}); unset repo;
     repos=(${repos[@]:-});
 
+    local omits=();
+    omits+=(${o[@]:-}); unset o;
+    omits+=(${omit[@]:-}); unset omit;
+    omits=(${omits[@]:-});
+
     local query=".repos | {repos: .}";
+    local filters=();
 
     if test ${#repos[@]} -gt 0; then
         # prefix each element
         repos=("${repos[@]/#/'.name == "'}");
         # suffix each element
         repos=("${repos[@]/%/'" or'}");
-        query="$(cat <<________EOF | tr -s '[:space:]'
-        .repos
-        | map(select(${repos[@]} false))
-        | {repos: .}
-________EOF
-)";
+        filters+=("| map(select(${repos[@]} false))");
+    fi
+
+    if test ${#omits[@]} -gt 0; then
+        # prefix each element
+        omits=("${omits[@]/#/'.name != "'}");
+        # suffix each element
+        omits=("${omits[@]/%/'" and'}");
+        filters+=("| map(select(${omits[@]} true))");
+    fi
+
+    if test -n "${filters:-}"; then
+        query=".repos ${filters[@]} | {repos: .}";
     fi
 
     rapids-query-manifest "$@" "${query}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 2a702ee68..a1ef52bf9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -12,7 +12,10 @@
 #  -k,--key <key>        Only include the key(s)
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Omit dependencies for repo(s).
+#                        (default: none)
 #  --repo <repo>         Only include dependencies for repo(s).
+#                        (default: all repositories)
 
 . devcontainer-utils-parse-args-from-docstring;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index c2855f404..0bef98333 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -13,7 +13,10 @@
 #  -k,--key <key>        Only include the key(s)
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Omit dependencies for repo(s).
+#                        (default: none)
 #  --repo <repo>         Only include dependencies for repo(s).
+#                        (default: all repositories)
 
 . devcontainer-utils-parse-args-from-docstring;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index de1c21a90..bbd367987 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -12,7 +12,10 @@
 #  -k,--key <key>          Only include the key(s)
 #  -m,--manifest <file>    Use a specific manifest.json
 #                          (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>        Omit dependencies for repo(s).
+#                          (default: none)
 #  --repo <repo>           Only include dependencies for repo(s).
+#                          (default: all repositories)
 #  -r,--requirement <file> Path(s) to additional requirement files to include.
 
 . devcontainer-utils-parse-args-from-docstring;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index a72b311b8..296950040 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -11,9 +11,12 @@
 #
 # Options that require values:
 #  -k,--key <key>          Only include the key(s)
-#  --repo <repo>           Only include dependencies for repo(s).
 #  -m,--manifest <file>    Use a specific manifest.json
 #                          (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>        Omit dependencies for repo(s).
+#                          (default: none)
+#  --repo <repo>           Only include dependencies for repo(s).
+#                          (default: all repositories)
 #  -r,--requirement <file> Path(s) to additional requirement files to include.
 
 . devcontainer-utils-parse-args-from-docstring;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 0a05c415b..5f5be46a1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -11,6 +11,8 @@
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
+#                        (default: none)
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index 5130eabd9..739dcdf11 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -11,6 +11,8 @@
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
+#                        (default: none)
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index 9cd1ba5e2..9bdcdad5b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -14,6 +14,8 @@
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
+#                        (default: none)
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index 197dc3cc1..567cc3660 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -11,6 +11,8 @@
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
+#                        (default: none)
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index 9ab763d95..524aabf47 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -11,6 +11,8 @@
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
+#                        (default: none)
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 

From 5055b15d61c5155e826652872606d402340c7d53 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 13:39:37 -0800
Subject: [PATCH 036/217] install the utils repo from disk, ignore cron.d
 startup error

---
 .devcontainer/cuda11.8-conda/devcontainer.json | 2 ++
 .devcontainer/cuda11.8-pip/devcontainer.json   | 2 ++
 .devcontainer/cuda12.0-conda/devcontainer.json | 2 ++
 .devcontainer/cuda12.0-pip/devcontainer.json   | 2 ++
 features/src/utils/devcontainer-feature.json   | 2 +-
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
index 5aa82c5f4..5643f3426 100644
--- a/.devcontainer/cuda11.8-conda/devcontainer.json
+++ b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -10,9 +10,11 @@
   },
   "hostRequirements": {"gpu": "optional"},
   "features": {
+    "./features/src/utils": {},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
+    "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda11.8-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index 94212b758..a66f82a99 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -12,11 +12,13 @@
   "features": {
     "./features/src/ucx": {"version": "1.14.1"},
     "./features/src/cuda": {"installcuDNN": true},
+    "./features/src/utils": {},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
     "./features/src/ucx",
     "./features/src/cuda",
+    "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda11.8-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
index 40c6b8899..ae02ba519 100644
--- a/.devcontainer/cuda12.0-conda/devcontainer.json
+++ b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -10,9 +10,11 @@
   },
   "hostRequirements": {"gpu": "optional"},
   "features": {
+    "./features/src/utils": {},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
+    "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.0-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index 186498d18..d7465e4f8 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -12,11 +12,13 @@
   "features": {
     "./features/src/ucx": {"version": "1.14.1"},
     "./features/src/cuda": {"installcuDNN": true},
+    "./features/src/utils": {},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
     "./features/src/ucx",
     "./features/src/cuda",
+    "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.0-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index f0f3fb3de..40820dba5 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -7,7 +7,7 @@
     "BASH_ENV": "/etc/bash.bash_env"
   },
   "postCreateCommand": [
-    "cron"
+    "/bin/bash", "-c", "if ! test -f /var/run/crond.pid; then cron 2>/dev/null || true; fi"
   ],
   "postAttachCommand": [
     "/bin/bash",

From 33f6b0c494744122efab19e0af130da7f7f6fe0c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 14:04:51 -0800
Subject: [PATCH 037/217] parse args after env name

---
 .../opt/rapids-build-utils/bin/make-conda-env.sh                | 2 +-
 .../opt/rapids-build-utils/bin/make-pip-env.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 0bef98333..94bf97521 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -23,7 +23,7 @@
 make_conda_env() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    parse_args_or_show_help - <<< "${@:2}";
 
     local env_name="${1}";
     local env_file_name="${env_name}.yml";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 296950040..563af8829 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -24,7 +24,7 @@
 make_pip_env() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    parse_args_or_show_help - <<< "${@:2}";
 
     local env_name="${1}";
     local env_file_name="${env_name}.requirements.txt";

From dcee2a6b107c36ea039f01e9d70c60d75ef3db4b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 14:20:54 -0800
Subject: [PATCH 038/217] fix typo

---
 features/src/utils/opt/devcontainer/bin/parse-args.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 74f2732b1..645248f03 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -51,7 +51,7 @@ parse_args() {
             shift;
             # -fooval
             local found="";
-            if test "${#vars_array}" -gt 0 \
+            if test "${#vars_array[@]}" -gt 0 \
             && grep -qP "^--?${vars}([^\s])+$" <<< "${arg:-}"; then
                 for name in ${vars_array[@]}; do
                     if grep -qP "^--?${name}([0-9]|\.)+$" <<< "${arg:-}"; then
@@ -78,8 +78,6 @@ parse_args() {
                 else
                     val="true";
                 fi
-            else
-                rest+=("${arg@Q}");
             fi
         else
             rest+=("${@@Q}");

From 9bee84a0d125f89c7d40a2c979264250c03f4226 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 18 Jan 2024 14:46:18 -0800
Subject: [PATCH 039/217] fix paths

---
 .../opt/rapids-build-utils/bin/generate-scripts.sh   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 31dac8843..8f51e376f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -208,9 +208,9 @@ generate_scripts() {
                 fi
                 local dep_cpp_path="${cpp_name_to_path["${dep_cpp_name}"]}";
 
-                deps+=(-D${!dep}_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
-                deps+=(-D${!dep,,}_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
-                deps+=(-D${!dep^^}_ROOT=\"$(realpath -m ~/${dep_cpp_path}/build/latest)\");
+                deps+=(-D${!dep}_ROOT=\"${dep_cpp_path}/build/latest\");
+                deps+=(-D${!dep,,}_ROOT=\"${dep_cpp_path}/build/latest\");
+                deps+=(-D${!dep^^}_ROOT=\"${dep_cpp_path}/build/latest\");
             done
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
@@ -237,9 +237,9 @@ generate_scripts() {
             args+=(-DFIND_${cpp_lib}_CPP=ON);
             args+=(-DFIND_${cpp_lib,,}_CPP=ON);
             args+=(-DFIND_${cpp_lib^^}_CPP=ON);
-            deps+=(-D${cpp_lib}_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
-            deps+=(-D${cpp_lib,,}_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
-            deps+=(-D${cpp_lib^^}_ROOT=\"$(realpath -m ~/${cpp_dir}/build/latest)\");
+            deps+=(-D${cpp_lib}_ROOT=\"${cpp_dir}/build/latest\");
+            deps+=(-D${cpp_lib,,}_ROOT=\"${cpp_dir}/build/latest\");
+            deps+=(-D${cpp_lib^^}_ROOT=\"${cpp_dir}/build/latest\");
         done
 
         for ((j=0; j < ${!py_length:-0}; j+=1)); do

From 6f82337e087692c7e0acda7f189e29365d8560ec Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 16:50:41 -0800
Subject: [PATCH 040/217] make individual <script>-all templates so they can
 have docstrings

---
 .../bin/generate-scripts.sh                   |  9 +++-
 .../bin/tmpl/all.build.tmpl.sh                | 48 +++++++++++++++++
 .../bin/tmpl/all.clean.tmpl.sh                | 43 +++++++++++++++
 .../bin/tmpl/all.clone.tmpl.sh                | 52 +++++++++++++++++++
 .../bin/tmpl/all.configure.tmpl.sh            | 46 ++++++++++++++++
 5 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 8f51e376f..5ed64d96b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -17,7 +17,8 @@ generate_script() {
     if test -n "${bin}"; then
         (
             cat - \
-          | envsubst '$NAME
+          | envsubst '$HOME
+                      $NAME
                       $SRC_PATH
                       $PY_ENV
                       $PY_SRC
@@ -84,7 +85,11 @@ generate_all_script_impl() {
 }
 
 generate_all_script() {
-    if test -f "${TEMPLATES}/all.tmpl.sh"; then (
+    if test -f "${TEMPLATES}/all.${SCRIPT}.tmpl.sh"; then (
+        cat "${TEMPLATES}/all.${SCRIPT}.tmpl.sh" \
+      | generate_all_script_impl       ;
+    ) || true;
+    elif test -f "${TEMPLATES}/all.tmpl.sh"; then (
         cat "${TEMPLATES}/all.tmpl.sh" \
       | generate_all_script_impl       ;
     ) || true;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
new file mode 100755
index 000000000..1ba8f71b5
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  build-all [OPTION]...
+#
+# Runs build-<repo> for each repo in "${NAMES}".
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+#  -t,--type editable|wheel               The type of Python build to run (editable or wheel)
+#                                         (default: editable)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+
+. devcontainer-utils-parse-args-from-docstring;
+
+build_all() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    for name in ${NAMES}; do
+        if type build-${name} >/dev/null 2>&1; then
+            build-${name} "$@";
+        fi
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-all"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+build_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
new file mode 100755
index 000000000..92ee73ab5
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  clean-all [OPTION]...
+#
+# Runs clean-<repo> for each repo in "${NAMES}".
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#
+# Options that require values:
+#  -j,--parallel <num>          Clone <num> repos in parallel
+
+. devcontainer-utils-parse-args-from-docstring;
+
+clean_all() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    eval "$(                                    \
+        rapids-get-num-archs-jobs-and-load "$@" \
+      | xargs -r -d'\n' -I% echo -n local %\;   \
+    )";
+
+    echo "${NAMES}" \
+  | tr '[:space:]' '\0' \
+  | xargs -r -0 -P${n_jobs} -I% bash -c "
+    if type clean-% >/dev/null 2>&1; then
+        clean-% '$@';
+    fi
+    ";
+}
+
+if test -n "${rapids_clean_utils_debug:-}" \
+&& ( test -z "${rapids_clean_utils_debug##*"all"*}" \
+  || test -z "${rapids_clean_utils_debug##*"clean-all"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+clean_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
new file mode 100755
index 000000000..f2a8468df
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  clone-all [OPTION]...
+#
+# Runs clone-<repo> for each repo in "${NAMES}".
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
+#                               (default: false)
+#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
+#                               (default: false)
+#  --clone-upstream             always clone the upstream, not the user's fork
+#                               (default: false)
+#
+# Options that require values:
+#  -j,--parallel <num>          Clone <num> repos in parallel
+
+. devcontainer-utils-parse-args-from-docstring;
+
+clone_all() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    eval "$(                                    \
+        rapids-get-num-archs-jobs-and-load "$@" \
+      | xargs -r -d'\n' -I% echo -n local %\;   \
+    )";
+
+    local clone_args=();
+    clone_args+=(${no_fork:+"--no-fork"});
+    clone_args+=(${no_update_env:+"--no-update-env"});
+    clone_args+=(${clone_upstream:+"--clone-upstream"});
+
+    echo "${NAMES}" \
+  | tr '[:space:]' '\0' \
+  | xargs -r -0 -P${n_jobs} -I% bash -c "
+    if type clone-% >/dev/null 2>&1; then
+        clone-% ${clone_args[*]};
+    fi
+    ";
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clone-all"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+clone_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
new file mode 100755
index 000000000..412e185d2
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  configure-all [OPTION]...
+#
+# Runs configure-<repo> for each repo in "${NAMES}".
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+#
+# Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+
+. devcontainer-utils-parse-args-from-docstring;
+
+configure_all() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    for name in ${NAMES}; do
+        if type configure-${name} >/dev/null 2>&1; then
+            configure-${name} "$@";
+        fi
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-all"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+configure_all "$@";

From 6ac9f81692712bbc9b5930efd95617b7f883200d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 16:53:52 -0800
Subject: [PATCH 041/217] only auth with gh/glab if neither --no-fork nor
 --clone-upstream are passed

---
 .../src/utils/opt/devcontainer/bin/github/repo/clone.sh  | 9 ++++++---
 .../src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh  | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index c5eb28088..e81e6ecbf 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -105,13 +105,16 @@ clone_github_repo() {
     local fork=;
     local owner=;
 
-    if test -z "${clone_upstream:-}" || \
-      (test -z "${no_fork:-}" && devcontainer-utils-shell-is-interactive); then
+    if test -z "${no_fork:-}" && \
+       test -z "${clone_upstream:-}" && \
+       devcontainer-utils-shell-is-interactive; then
         source devcontainer-utils-init-github-cli;
         user="${GITHUB_USER:-}";
     fi
 
-    if test -z "${clone_upstream:-}"; then
+    if test -n "${clone_upstream:-}"; then
+        fork="${upstream}";
+    else
         name="$(get_repo_name "${upstream}")";
         owner="$(get_repo_owner "${upstream}")";
         user="${GITHUB_USER:-"${owner}"}";
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 051cfd2a4..f3e556777 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -131,13 +131,16 @@ clone_gitlab_repo() {
     local user=;
     local owner=;
 
-    if test -z "${clone_upstream:-}" || \
-      (test -z "${no_fork:-}" && devcontainer-utils-shell-is-interactive); then
+    if test -z "${no_fork:-}" && \
+       test -z "${clone_upstream:-}" && \
+       devcontainer-utils-shell-is-interactive; then
         source devcontainer-utils-init-gitlab-cli;
         user="${GITLAB_USER:-}";
     fi
 
-    if test -z "${clone_upstream:-}"; then
+    if test -n "${clone_upstream:-}"; then
+        fork="${upstream}";
+    else
         name="$(get_repo_name "${upstream}")";
         owner="$(get_repo_owner "${upstream}")";
         user="${GITLAB_USER:-"${owner}"}";

From 4931c4ce034171b4cba094ef4f55cdd1f70a7961 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 16:55:26 -0800
Subject: [PATCH 042/217] default to -j1 if no value is passed, but assume full
 parallelism in configure/build script templates

---
 .../bin/get-num-archs-jobs-and-load.sh                 |  9 +++++----
 .../opt/rapids-build-utils/bin/tmpl/build.tmpl.sh      | 10 ++++++++++
 .../opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh  |  3 ++-
 .../rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh  |  1 +
 .../bin/tmpl/python-build-editable.tmpl.sh             |  1 +
 .../bin/tmpl/python-build-wheel.tmpl.sh                |  1 +
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index f231923ca..2e0d66ef6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -26,15 +26,16 @@
 . devcontainer-utils-parse-args-from-docstring;
 
 get_num_archs_jobs_and_load() {
-    set -euo pipefail
+    set -Eeuo pipefail
 
     parse_args_or_show_help - <<< "$@";
 
-    local archs="${a:-${archs:-}}";
+    local archs="${a:-${archs:-1}}";
     archs="${archs//"true"/}";
 
-    local parallel="${j:-${parallel:-}}";
+    local parallel="${j:-${parallel:-${JOBS:-${PARALLEL_LEVEL:-1}}}}";
     parallel="${parallel//"true"/}";
+    parallel="${parallel:-$(nproc)}";
 
     local max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-}}}";
     max_device_obj_memory_usage="${max_device_obj_memory_usage//"true"/}";
@@ -75,7 +76,7 @@ get_num_archs_jobs_and_load() {
 
     local free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
     local freeswap=$(free --giga | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
-    local all_cpus="${parallel:-${JOBS:-${PARALLEL_LEVEL:-$(nproc)}}}";
+    local all_cpus="${parallel}";
     local n_load="${all_cpus}";
     local n_jobs="$(cat<<____EOF | bc
 scale=0
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
index 2aab58c90..fe7acff8f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
@@ -10,8 +10,18 @@
 #  -v,--verbose                           verbose output
 #
 # Options that require values:
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
 #  -t,--type editable|wheel               The type of Python build to run (editable or wheel)
 #                                         (default: editable)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 . devcontainer-utils-parse-args-from-docstring;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
index 931e22ba1..69cae4183 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
@@ -19,7 +19,7 @@
 #                                         limit.
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
-#  -D* <var>[:<type>]=<value>   Create or update a cmake cache entry.
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 . devcontainer-utils-parse-args-from-docstring;
 
@@ -37,6 +37,7 @@ build_${CPP_LIB}_cpp() {
     configure-${CPP_LIB}-cpp ${verbose:+-v} ${__rest__[@]};
 
     eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
       | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
index 7f195c349..6ac4df3b5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
@@ -35,6 +35,7 @@ configure_${CPP_LIB}_cpp() {
     local verbose="${v:-${verbose:-}}";
 
     eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
       | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
index e44267b39..60b71c46d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
@@ -34,6 +34,7 @@ build_${PY_LIB}_python_editable() {
     local verbose="${v:-${verbose:-}}";
 
     eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
       | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
index 6ed634982..87b6fb21c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
@@ -57,6 +57,7 @@ build_${PY_LIB}_python_wheel() {
     local wheel_dir="${w:-${wheel_dir:-}}";
 
     eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
       | xargs -r -d'\n' -I% echo -n local %\;   \
     )";

From dd4b3ac806376d58a466fd206c2a79dc49e50186 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 19 Jan 2024 05:57:19 +0000
Subject: [PATCH 043/217] fetch the branch before checking it out

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .../opt/rapids-build-utils/bin/checkout-same-branch.sh          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 1e51648e7..e42085b52 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -94,11 +94,13 @@ checkout_same_branch() {
         fi
 
         if test -z "${branch_name##*"origin/"*}"; then
+            git -C ~/${!repo_path} fetch origin "refs/heads/${branch_name/#origin\//}";
             if ! git -C ~/${!repo_path} checkout --recurse-submodules -t "${branch_name}" -b "${branch_name/#origin\//}"   2>/dev/null; then
                 git -C ~/${!repo_path} checkout --recurse-submodules "${branch_name/#origin\//}";
                 git -C ~/${!repo_path} branch "${branch_name/#origin\//}" -u "${branch_name}";
             fi
         elif test -z "${branch_name##*"upstream/"*}"; then
+            git -C ~/${!repo_path} fetch upstream "refs/heads/${branch_name/#upstream\//}";
             if ! git -C ~/${!repo_path} checkout --recurse-submodules -t "${branch_name}" -b "${branch_name/#upstream\//}" 2>/dev/null; then
                 git -C ~/${!repo_path} checkout --recurse-submodules "${branch_name/#upstream\//}";
                 git -C ~/${!repo_path} branch "${branch_name/#upstream\//}" -u "${branch_name}";

From 1ab9ff4344e44e73ab97e4fc1d58d8bfe2ebf5ef Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 19 Jan 2024 05:57:28 +0000
Subject: [PATCH 044/217] fix typo

Signed-off-by: ptaylor <paul.e.taylor@me.com>
---
 .../opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
index d31e234ab..8f4f6cde5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  clone-${NAME}-cpp [OPTION]...
+#  clone-${NAME} [OPTION]...
 #
 # Clone the ${NAME} repository.
 #

From fe22eb5610e10ac3e5992e2e69e57a91e1638d40 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 18:33:43 -0800
Subject: [PATCH 045/217] simplify checkout-same-branch a bit

---
 .../bin/checkout-same-branch.sh               | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index e42085b52..4347a2058 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -9,6 +9,14 @@
 #
 # Boolean options:
 #  -h,--help,--usage  print this text
+#
+# Options that require values:
+#  -m,--manifest <file>  Use a specific manifest.json
+#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
+#                        (default: none)
+#  -r,--repo <repo>      Filter the results to include <repo> entries.
+#                        (default: all repositories)
 
 . devcontainer-utils-parse-args-from-docstring;
 
@@ -93,22 +101,17 @@ checkout_same_branch() {
             continue;
         fi
 
-        if test -z "${branch_name##*"origin/"*}"; then
-            git -C ~/${!repo_path} fetch origin "refs/heads/${branch_name/#origin\//}";
-            if ! git -C ~/${!repo_path} checkout --recurse-submodules -t "${branch_name}" -b "${branch_name/#origin\//}"   2>/dev/null; then
-                git -C ~/${!repo_path} checkout --recurse-submodules "${branch_name/#origin\//}";
-                git -C ~/${!repo_path} branch "${branch_name/#origin\//}" -u "${branch_name}";
-            fi
-        elif test -z "${branch_name##*"upstream/"*}"; then
-            git -C ~/${!repo_path} fetch upstream "refs/heads/${branch_name/#upstream\//}";
-            if ! git -C ~/${!repo_path} checkout --recurse-submodules -t "${branch_name}" -b "${branch_name/#upstream\//}" 2>/dev/null; then
-                git -C ~/${!repo_path} checkout --recurse-submodules "${branch_name/#upstream\//}";
-                git -C ~/${!repo_path} branch "${branch_name/#upstream\//}" -u "${branch_name}";
-            fi
-        fi
+        local remote="${branch_name/\/*}";
+        local branch="${branch_name/*\/}";
 
-        git -C ~/${!repo_path} submodule update --init --recursive;
+        git -C ~/${!repo_path} fetch ${remote} "refs/heads/${branch}";
+
+        if ! git -C ~/${!repo_path} checkout -b "${branch}" -t "${remote}/${branch}" 2>/dev/null; then
+            git -C ~/${!repo_path} checkout "${branch}";
+            git -C ~/${!repo_path} branch "${branch}" -u "${remote}/${branch}";
+        fi
 
+        git -C ~/${!repo_path} submodule update --init --recursive -j $(nproc --ignore=2);
     done;
 }
 

From 44a6251c760bc1e7248b8fce6cc56f68b145720e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 18:35:17 -0800
Subject: [PATCH 046/217] add -j option to clone scripts to adjust submodule
 parallelism, make clone scripts skip github/gitlab API calls unless logged in

---
 .../bin/tmpl/all.clone.tmpl.sh                | 12 +++++--
 .../rapids-build-utils/bin/tmpl/clone.tmpl.sh |  8 ++++-
 .../opt/devcontainer/bin/git/repo/clone.sh    |  4 ++-
 .../opt/devcontainer/bin/github/repo/clone.sh | 32 ++++++++++++-------
 .../opt/devcontainer/bin/gitlab/repo/clone.sh | 31 +++++++++++-------
 5 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index f2a8468df..80cec889c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -29,13 +29,21 @@ clone_all() {
       | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
+    local all_cpus=$(nproc);
+    local n_repos=$(wc -w <<< "${NAMES}");
+    n_jobs=$((n_repos < n_jobs ? n_repos : n_jobs));
+
+    local n_modules=$((all_cpus / n_jobs));
+    n_modules=$((n_modules < 1 ? 1 : n_modules));
+
     local clone_args=();
+    clone_args+=(-j ${n_modules});
     clone_args+=(${no_fork:+"--no-fork"});
     clone_args+=(${no_update_env:+"--no-update-env"});
     clone_args+=(${clone_upstream:+"--clone-upstream"});
 
-    echo "${NAMES}" \
-  | tr '[:space:]' '\0' \
+    echo "${NAMES}"                     \
+  | tr '[:space:]' '\0'                 \
   | xargs -r -0 -P${n_jobs} -I% bash -c "
     if type clone-% >/dev/null 2>&1; then
         clone-% ${clone_args[*]};
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
index 8f4f6cde5..6a9c2832c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
@@ -19,6 +19,7 @@
 #                               (default: `${NAME}.git.tag` in manifest.yaml)
 #  -d,--directory <dir>         clone the repo into <dir>
 #                               (default: `${NAME}.path` in manifest.yaml)
+#  -j,--parallel <num>          Clone <num> submodules in parallel
 #  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
 #                               (default: `${NAME}.git.upstream` in manifest.yaml)
 
@@ -31,6 +32,11 @@ clone_${NAME}() {
 
     if [[ ! -d "${SRC_PATH}"/.git ]]; then
 
+        eval "$(                                    \
+            rapids-get-num-archs-jobs-and-load "$@" \
+          | xargs -r -d'\n' -I% echo -n local %\;   \
+        )";
+
         local no_fork="${no_fork:-}";
         local no_update_env="${no_update_env:-}";
         local clone_upstream="${clone_upstream:-}";
@@ -44,7 +50,7 @@ clone_${NAME}() {
             --tags                                \
             --branch "${branch}"                  \
             --recurse-submodules                  \
-            -j $(nproc --ignore=2)                \
+            -j ${n_jobs:-$(nproc --ignore=1)}     \
             -c checkout.defaultRemote=upstream    \
             ${no_fork:+--no-fork 1}               \
             ${clone_upstream:+--clone-upstream 1} \
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 7405f4225..e029498c0 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -19,6 +19,7 @@
 # Options that require values:
 #  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
 #                               (default: `${NAME}.git.tag` in manifest.yaml)
+#  -j,--parallel <num>          Clone <num> submodules in parallel
 #  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
 #
 # Positional arguments:
@@ -32,6 +33,7 @@ clone_git_repo() {
     parse_args_or_show_help - <<< "$@";
 
     local branch="${b:-"${branch:-}"}";
+    local parallel="${j:-${parallel:-1}}";
     local upstream="${u:-"${upstream:-}"}";
 
     local nargs="${#__rest__[@]}";
@@ -92,7 +94,7 @@ clone_git_repo() {
         fi
     fi
 
-    git -C "${directory}" submodule update --init --recursive;
+    git -C "${directory}" submodule update --init --recursive -j ${parallel};
 }
 
 if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index e81e6ecbf..a08e58c4d 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -18,6 +18,7 @@
 #
 # Options that require values:
 #  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#  -j,--parallel <num>          Clone <num> submodules in parallel
 #
 # Positional arguments:
 #  upstream                     set <upstream> as the `upstream` remote
@@ -90,8 +91,9 @@ clone_github_repo() {
     upstream="${upstream:?upstream is required}";
 
     local no_fork="${no_fork:-}";
+    local branch="${b:-"${branch:-}"}";
+    local parallel="${j:-${parallel:-1}}";
     local clone_upstream="${clone_upstream:-}";
-    local branch="${b:-"${branch:-"$(get_default_branch "${upstream}")"}"}";
 
     local directory="${__rest__[$((nargs - 1))]}";
     directory="${directory:?directory is required}";
@@ -118,6 +120,7 @@ clone_github_repo() {
         name="$(get_repo_name "${upstream}")";
         owner="$(get_repo_owner "${upstream}")";
         user="${GITHUB_USER:-"${owner}"}";
+        branch="${branch:-"$(get_default_branch "${upstream}")"}";
         fork="$(get_user_fork_name "${owner}" "${name}" "${user}")";
     fi
 
@@ -140,19 +143,26 @@ clone_github_repo() {
         done
     fi
 
-    if [ "$(gh config get git_protocol)" = "ssh" ]; then
-        origin="$(get_repo_ssh_url "${origin}")";
-        upstream="$(get_repo_ssh_url "${upstream}")";
+    if test -n "${GITHUB_USER:-}"; then
+        if [ "$(gh config get git_protocol)" = "ssh" ]; then
+            origin="$(get_repo_ssh_url "${origin}")";
+            upstream="$(get_repo_ssh_url "${upstream}")";
+        else
+            origin="$(get_repo_git_url "${origin}")";
+            upstream="$(get_repo_git_url "${upstream}")";
+        fi
     else
-        origin="$(get_repo_git_url "${origin}")";
-        upstream="$(get_repo_git_url "${upstream}")";
+        origin="https://${GITHUB_HOST:-github.com}/${origin}.git";
+        upstream="https://${GITHUB_HOST:-github.com}/${upstream}.git";
     fi
 
-    devcontainer-utils-clone-git-repo \
-        --upstream "${upstream}"      \
-        --branch "${branch}"          \
-        ${__rest__[@]}                \
-        "${origin}" "${directory}"    ;
+    devcontainer-utils-clone-git-repo         \
+        ${branch:+--branch "${branch}"}       \
+        ${upstream:+--upstream "${upstream}"} \
+        -j ${parallel}                        \
+        ${__rest__[@]}                        \
+        "${origin}" "${directory}"            \
+        ;
 }
 
 if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index f3e556777..0f1e4c5ba 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -116,8 +116,9 @@ clone_gitlab_repo() {
     upstream="${upstream:?upstream is required}";
 
     local no_fork="${no_fork:-}";
+    local branch="${b:-"${branch:-}"}";
+    local parallel="${j:-${parallel:-1}}";
     local clone_upstream="${clone_upstream:-}";
-    local branch="${b:-"${branch:-"$(get_default_branch "${upstream}")"}"}";
 
     local directory="${__rest__[$((nargs - 1))]}";
     directory="${directory:?directory is required}";
@@ -144,6 +145,7 @@ clone_gitlab_repo() {
         name="$(get_repo_name "${upstream}")";
         owner="$(get_repo_owner "${upstream}")";
         user="${GITLAB_USER:-"${owner}"}";
+        branch="${branch:-"$(get_default_branch "${upstream}")"}";
         fork="$(get_user_fork_name "${owner}" "${name}" "${user}")";
     fi
 
@@ -166,19 +168,26 @@ clone_gitlab_repo() {
         done
     fi
 
-    if [ "$(glab config get git_protocol)" = "ssh" ]; then
-        origin="$(get_repo_ssh_url "${origin}")";
-        upstream="$(get_repo_ssh_url "${upstream}")";
+    if test -n "${GITLAB_USER:-}"; then
+        if [ "$(glab config get git_protocol)" = "ssh" ]; then
+            origin="$(get_repo_ssh_url "${origin}")";
+            upstream="$(get_repo_ssh_url "${upstream}")";
+        else
+            origin="$(get_repo_git_url "${origin}")";
+            upstream="$(get_repo_git_url "${upstream}")";
+        fi
     else
-        origin="$(get_repo_git_url "${origin}")";
-        upstream="$(get_repo_git_url "${upstream}")";
+        origin="https://${GITLAB_HOST:-gitlab.com}/${origin}.git";
+        upstream="https://${GITLAB_HOST:-gitlab.com}/${upstream}.git";
     fi
 
-    devcontainer-utils-clone-git-repo \
-        --upstream "${upstream}"      \
-        --branch "${branch}"          \
-        ${__rest__[@]}                \
-        "${origin}" "${directory}"    ;
+    devcontainer-utils-clone-git-repo         \
+        ${branch:+--branch "${branch}"}       \
+        ${upstream:+--upstream "${upstream}"} \
+        -j ${parallel}                        \
+        ${__rest__[@]}                        \
+        "${origin}" "${directory}"            \
+        ;
 }
 
 if test -n "${devcontainer_utils_debug:-}" \

From f03c7b8faebe529362fc57ef376d3911add0ad3b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 22:27:28 -0800
Subject: [PATCH 047/217] add --parallel flag to checkout-same-branch

---
 .../bin/checkout-same-branch.sh               | 90 ++++++++++++-------
 1 file changed, 58 insertions(+), 32 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 4347a2058..cbb3b83c1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -11,6 +11,7 @@
 #  -h,--help,--usage  print this text
 #
 # Options that require values:
+#  -j,--parallel <num>   Fetch <num> repos in parallel
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
 #  -o,--omit <repo>      Filter the results to exclude <repo> entries.
@@ -25,6 +26,12 @@ checkout_same_branch() {
 
     parse_args_or_show_help - <<< "$@";
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+      | xargs -r -d'\n' -I% echo -n local %\;   \
+    )";
+
     eval "$(                                  \
         rapids-list-repos "$@"                \
       | xargs -r -d'\n' -I% echo -n local %\; \
@@ -32,53 +39,72 @@ checkout_same_branch() {
 
     echo "Determining available branches...";
 
-    local all_repos=();
-    local common_branches="";
-
+    local repo_names=();
+    local repo_paths=();
+    local repo_pairs=();
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
-
         local repo="repos_${i}";
         local repo_name="${repo}_name";
         local repo_path="${repo}_path";
-
         if [[ ! -d ~/"${!repo_path:-}/.git" ]]; then
             continue;
-        fi;
-
-        echo "Fetching ${!repo_name} branches...";
-        local remote_branches="$(                           \
-            tr '[:space:]' '\0' <<< 'origin upstream'       \
-          | xargs -r -0 -P2 -I% sh -c "                     \
-              git -C ~/${!repo_path} ls-remote -h %         \
-            | cut -f2 | grep -Ev 'refs/heads/pull-request/' \
-            | sed 's@refs/heads@%@'"                        \
-        )";
-
-        if [ ${#all_repos[@]} -eq 0 ]; then
+        fi
+        local name="${!repo_name}";
+        local path="${!repo_path}";
+        repo_names+=(${name});
+        repo_paths+=(${path});
+        repo_pairs+=("${name//"-"/"_"} ${path}");
+    done
+
+    eval "$(
+        echo -e "${repo_pairs[@]/%/\\n}"                                                              \
+      | xargs -r -P${n_jobs} -I% bash -c "                                                            \
+        name=\$(cut -d' ' -f1 <<< \$0);                                                               \
+        path=\$(cut -d' ' -f2 <<< \$0);                                                               \
+        echo \"repo_branches_\${name}_='\$(                                                           \
+            cat <(git -C ~/\${path} ls-remote -h origin | cut -f2 | sed \"s@refs/heads@origin@\")     \
+                <(git -C ~/\${path} ls-remote -h upstream | cut -f2 | sed \"s@refs/heads@upstream@\") \
+          | grep -Pv \"(refs/heads/pull-request/|master|main)\" | tr '[:space:]' ' '                  \
+        )'\"                                                                                          \
+        " % \
+      | xargs -r -d'\n' -I% echo -n local %\;
+    )";
+
+    local repo_branches=;
+    local common_branches=;
+
+    for repo_branches in ${!repo_branches_*}; do
+        if test -z "${common_branches}"; then
             # start with first repo's set of branches
-            common_branches="$(echo -e "$remote_branches" | sort -V)";
+            common_branches="$(\
+                echo "${!repo_branches}"     \
+              | xargs -r -n1                 \
+              | sort -V --parallel=${n_jobs} \
+              | tr '[:space:]' ' '           \
+            )";
         else
             # get a sorted set of branches common to all repos up to this point
-            common_branches="$(echo -e "$common_branches\n$remote_branches" | sort -V | uniq -d)";
+            common_branches="$(\
+                echo "${common_branches} ${!repo_branches}" \
+              | xargs -r -n1                                \
+              | sort -V --parallel=${n_jobs}                \
+              | uniq -d                                     \
+              | tr '[:space:]' ' '                          \
+            )";
         fi
+    done
 
-        common_branches="$(echo -e "$common_branches" | grep -v master | grep -v main | sort -Vr)";
-
-        all_repos+=(${!repo_name});
-
-    done;
-
-    if [[ -z $common_branches ]]; then
-        echo "No branches in common for repos: ${all_repos[@]}"
+    if test -z "${common_branches}"; then
+        echo "No branches in common for repos: ${repo_names[@]}";
         exit 0;
     fi;
 
-    echo "Found branches in common for: ${all_repos[@]}"
+    echo "Found branches in common for: ${repo_names[@]}";
 
-    echo "Please select a branch to check out:"
+    echo "Please select a branch to check out:";
 
-    local branches=(${common_branches});
-    local branch_name=""
+    local branches=($(echo "${common_branches}" | xargs -r -n1 | sort -Vr --parallel=${n_jobs}));
+    local branch_name="";
 
     select branch_name in "${branches[@]}" "Quit"; do
         if [[ $REPLY -lt $(( ${#branches[@]}+1 )) ]]; then
@@ -86,7 +112,7 @@ checkout_same_branch() {
         elif [[ $REPLY -eq $(( ${#branches[@]}+1 )) ]]; then
             exit 0;
         else
-            echo "Invalid option, please select a branch (or quit)"
+            echo "Invalid option, please select a branch (or quit)";
         fi
     done;
 

From 2c03e6da2bff76b82dad2e9de1fea22aa3f871e1 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 23:57:07 -0800
Subject: [PATCH 048/217] add uninstall scripts

---
 .../bin/generate-scripts.sh                   |  8 ++--
 .../bin/tmpl/all.uninstall.tmpl.sh            | 34 +++++++++++++++++
 .../bin/tmpl/cpp-uninstall.tmpl.sh            | 36 ++++++++++++++++++
 .../bin/tmpl/python-uninstall.tmpl.sh         | 38 +++++++++++++++++++
 .../bin/tmpl/uninstall.tmpl.sh                | 38 +++++++++++++++++++
 5 files changed, 150 insertions(+), 4 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-uninstall.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/uninstall.tmpl.sh

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 5ed64d96b..67c695196 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -106,7 +106,7 @@ generate_clone_script() {
 
 generate_repo_scripts() {
     local script_name;
-    for script_name in "configure" "build" "clean"; do
+    for script_name in "configure" "build" "clean" "uninstall"; do
         if test -f "${TEMPLATES}/${script_name}.tmpl.sh"; then (
             cat "${TEMPLATES}/${script_name}.tmpl.sh" \
           | generate_script "${script_name}-${NAME}"  ;
@@ -117,7 +117,7 @@ generate_repo_scripts() {
 
 generate_cpp_scripts() {
     local script_name;
-    for script_name in "clean" "configure" "build" "cpack" "install"; do
+    for script_name in "clean" "configure" "build" "cpack" "install" "uninstall"; do
         if test -f "${TEMPLATES}/cpp-${script_name}.tmpl.sh"; then (
             cat "${TEMPLATES}/cpp-${script_name}.tmpl.sh"  \
           | CPP_SRC="${SRC_PATH:-}${CPP_SRC:+/$CPP_SRC}"   \
@@ -129,7 +129,7 @@ generate_cpp_scripts() {
 
 generate_python_scripts() {
     local script_name;
-    for script_name in "build" "clean"; do
+    for script_name in "build" "clean" "uninstall"; do
         if test -f "${TEMPLATES}/python-${script_name}.tmpl.sh"; then (
             cat "${TEMPLATES}/python-${script_name}.tmpl.sh" \
           | generate_script "${script_name}-${PY_LIB}-python";
@@ -307,7 +307,7 @@ generate_scripts() {
 
     unset cpp_name_to_path;
 
-    for script in "clone" "clean" "configure" "build" "cpack" "install"; do
+    for script in "clone" "clean" "configure" "build" "cpack" "install" "uninstall"; do
         # Generate a script to run a script for all repos
         (
             NAMES="${repo_names[@]}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
new file mode 100755
index 000000000..252d3c085
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  uninstall-all [OPTION]...
+#
+# Runs uninstall-<repo> for each repo in "${NAMES}".
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+
+. devcontainer-utils-parse-args-from-docstring;
+
+uninstall_all() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    for name in ${NAMES}; do
+        if type uninstall-${name} >/dev/null 2>&1; then
+            uninstall-${name} "$@";
+        fi
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+uninstall_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
new file mode 100755
index 000000000..ca75826c0
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  uninstall-${CPP_LIB}-cpp [OPTION]...
+#
+# Uninstall ${CPP_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+
+. devcontainer-utils-parse-args-from-docstring;
+
+uninstall_${CPP_LIB}_cpp() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    local verbose="${v:-${verbose:-}}";
+
+    if test -f "${CPP_SRC}"/build/latest/install_manifest.txt; then
+        time (
+            xargs ${verbose:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}"/build/latest/install_manifest.txt tr -d "\r") rm --;
+        { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} uninstall time:";
+    ) 2>&1;
+    fi
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-${CPP_LIB}-cpp"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+uninstall_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-uninstall.tmpl.sh
new file mode 100755
index 000000000..29cd723a2
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-uninstall.tmpl.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  uninstall-${PY_LIB}-python [OPTION]...
+#
+# Uninstall ${PY_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage print this text
+#  -v,--verbose      verbose output
+
+. devcontainer-utils-parse-args-from-docstring;
+
+uninstall_${PY_LIB}_python() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    local verbose="${v:-${verbose:-}}";
+
+    if [[ ! -d "${PY_SRC}" ]]; then
+        exit 1;
+    fi
+
+    time (
+        pip uninstall -y ${verbose:+-vv} "${PY_LIB}";
+        { set +x; } 2>/dev/null; echo -n "${PY_LIB} uninstall time:";
+    ) 2>&1;
+
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-${PY_LIB}-python"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+uninstall_${PY_LIB}_python "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/uninstall.tmpl.sh
new file mode 100755
index 000000000..841811625
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/uninstall.tmpl.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  uninstall-${NAME} [OPTION]...
+#
+# Uninstall ${CPP_LIB} and ${PY_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+
+. devcontainer-utils-parse-args-from-docstring;
+
+uninstall_${NAME}() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    for lib in ${CPP_LIB}; do
+        if type uninstall-${lib}-cpp >/dev/null 2>&1; then
+            uninstall-${lib}-cpp ${__rest__[@]};
+        fi
+    done
+
+    for lib in ${PY_LIB}; do
+        if type uninstall-${lib}-python >/dev/null 2>&1; then
+            uninstall-${lib}-python --type ${t:-${type:-"editable"}} ${__rest__[@]};
+        fi
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-${NAME}"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+uninstall_${NAME} "$@";

From 3c5e2d189521c77fa5a9ffdcdd7f1fd7e4b9e418 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 22 Jan 2024 23:57:14 -0800
Subject: [PATCH 049/217] fix typos

---
 .../opt/rapids-build-utils/bin/tmpl/build.tmpl.sh               | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
index fe7acff8f..1b92444e4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  build-${PY_LIB} [OPTION]...
+#  build-${NAME} [OPTION]...
 #
 # Configure and build ${CPP_LIB}, then build an editable install or wheel of ${PY_LIB}.
 #
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh
index b0af00960..ca559845a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  configure-${CPP_LIB} [OPTION]...
+#  configure-${NAME} [OPTION]...
 #
 # Runs the configure script in each ${CPP_LIB}.
 #

From e0dcc31118634f0892d7cc925e45aa0813fe0e3b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jan 2024 10:14:48 -0800
Subject: [PATCH 050/217] pass -v to rm

---
 .../opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
index ca75826c0..8f8d3ce27 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
@@ -21,7 +21,7 @@ uninstall_${CPP_LIB}_cpp() {
 
     if test -f "${CPP_SRC}"/build/latest/install_manifest.txt; then
         time (
-            xargs ${verbose:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}"/build/latest/install_manifest.txt tr -d "\r") rm --;
+            xargs ${verbose:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}"/build/latest/install_manifest.txt tr -d "\r") rm ${verbose:+-v} --;
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} uninstall time:";
     ) 2>&1;
     fi

From bebccff081f2e8de9bd5e69304221cf67f81d330 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jan 2024 10:42:20 -0800
Subject: [PATCH 051/217] shift off first arg

---
 .../opt/rapids-build-utils/bin/make-conda-env.sh |  8 ++++----
 .../opt/rapids-build-utils/bin/make-pip-env.sh   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 94bf97521..16ec109ae 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -23,11 +23,11 @@
 make_conda_env() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "${@:2}";
-
-    local env_name="${1}";
+    local env_name="${1}"; shift;
     local env_file_name="${env_name}.yml";
 
+    parse_args_or_show_help - <<< "$@";
+
     # Remove the current conda env if called with `-f|--force`
     if test -n "${f:-${force:-}}"; then
         rm -rf "$HOME/.conda/envs/${env_name}" \
@@ -80,6 +80,6 @@ fi
 . /opt/conda/etc/profile.d/conda.sh;
 . /opt/conda/etc/profile.d/mamba.sh;
 
-(make_conda_env "${DEFAULT_CONDA_ENV:-rapids}" "$@");
+make_conda_env "${DEFAULT_CONDA_ENV:-rapids}" "$@";
 
 . /etc/profile.d/*-mambaforge.sh;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 563af8829..2f92e2706 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -24,11 +24,11 @@
 make_pip_env() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "${@:2}";
-
-    local env_name="${1}";
+    local env_name="${1}"; shift;
     local env_file_name="${env_name}.requirements.txt";
 
+    parse_args_or_show_help - <<< "$@";
+
     # Remove the current virtual env if called with `-f|--force`
     if test -n "${f:-${force:-}}"; then
         rm -rf "$HOME/.local/share/venvs/${env_name}" \
@@ -38,10 +38,10 @@ make_pip_env() {
     local new_env_path="$(realpath -m /tmp/${env_file_name})";
     local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
 
-    rapids-make-pip-dependencies "$@"    \
-  | (grep -v -E '^$' || [ "$?" == "1" ]) \
-  | tr -s "[:blank:]"                    \
-  | LC_ALL=C sort -u                     \
+    rapids-make-pip-dependencies "$@"     \
+  | (grep -v -E '^$' || [ "$?" == "1" ])  \
+  | tr -s "[:blank:]"                     \
+  | LC_ALL=C sort -u                      \
   > "${new_env_path}"
 
     if test -f "${new_env_path}"; then
@@ -86,7 +86,7 @@ if test -n "${rapids_build_utils_debug:-}" \
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(make_pip_env "${DEFAULT_VIRTUAL_ENV:-rapids}" "$@");
+make_pip_env "${DEFAULT_VIRTUAL_ENV:-rapids}" "$@";
 
 if test -f ~/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate; then
     . ~/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate;

From 3798a0fb7e85f4f819dd09a54e3137784c58ed78 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jan 2024 16:48:36 -0800
Subject: [PATCH 052/217] add devcontainer-utils-generate-bash-completion
 script

---
 .../etc/bash_completion.d/build-rmm-cpp       |  3 --
 features/src/rapids-build-utils/install.sh    | 10 +---
 features/src/utils/.bash_completion           |  8 ++++
 features/src/utils/install.sh                 | 24 +++++-----
 .../devcontainer/bin/bash/completion.tmpl.sh  |  4 +-
 .../bin/bash/generate-bash-completion.sh      | 47 +++++++++++++++++++
 6 files changed, 70 insertions(+), 26 deletions(-)
 delete mode 100755 features/src/rapids-build-utils/etc/bash_completion.d/build-rmm-cpp
 create mode 100755 features/src/utils/.bash_completion
 create mode 100755 features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh

diff --git a/features/src/rapids-build-utils/etc/bash_completion.d/build-rmm-cpp b/features/src/rapids-build-utils/etc/bash_completion.d/build-rmm-cpp
deleted file mode 100755
index 8008661a2..000000000
--- a/features/src/rapids-build-utils/etc/bash_completion.d/build-rmm-cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/env bash
-
-# todo
diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 29dc5064d..e38a6a784 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -38,12 +38,7 @@ install_utility() {
     update-alternatives --install /usr/bin/${cmd} ${cmd} /opt/rapids-build-utils/bin/${src} 0;
 
     # Install bash_completion script
-    cat "$(which devcontainer-utils-bash-completion.tmpl)" \
-  | SCRIPT="${cmd}"                                        \
-    NAME="${cmd//-/_}"                                     \
-    envsubst '$SCRIPT $NAME'                               \
-  | tee "/etc/bash_completion.d/${cmd}" >/dev/null         \
-  ;
+    devcontainer-utils-generate-bash-completion --command "${cmd}" --out-dir /etc/bash_completion.d;
 }
 
 install_utility update-content-command;
@@ -74,9 +69,8 @@ find /opt/rapids-build-utils \
     \( -type d -exec chmod 0775 {} \; \
     -o -type f -exec chmod 0755 {} \; \);
 
-# Copy in bash completions
+# Create bash completions
 mkdir -p /etc/bash_completion.d/;
-cp -ar ./etc/bash_completion.d/* /etc/bash_completion.d/;
 
 yq shell-completion bash | tee /etc/bash_completion.d/yq >/dev/null;
 
diff --git a/features/src/utils/.bash_completion b/features/src/utils/.bash_completion
new file mode 100755
index 000000000..72022b122
--- /dev/null
+++ b/features/src/utils/.bash_completion
@@ -0,0 +1,8 @@
+if [ -d ~/.bash_completion.d ]; then
+  for i in ~/.bash_completion.d/*; do
+    if [ -r $i ]; then
+      . $i
+    fi
+  done
+  unset i
+fi
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 2e8d8f6b5..9a92366a0 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -68,24 +68,20 @@ install_utility() {
     update-alternatives --install /usr/bin/${cmd} ${cmd} /opt/devcontainer/bin/${src} 0;
 
     # Install bash_completion script
-    cat "$(which devcontainer-utils-bash-completion.tmpl)" \
-  | SCRIPT="${cmd}"                                        \
-    NAME="${cmd//-/_}"                                     \
-    envsubst '$SCRIPT $NAME'                               \
-  | tee "/etc/bash_completion.d/${cmd}" >/dev/null         \
-  ;
+    devcontainer-utils-generate-bash-completion --command "${cmd}" --out-dir /etc/bash_completion.d;
 }
 
 # Install alternatives
 
-# Install this first since we use it in `install_utility`
-update-alternatives --install \
-    /usr/bin/devcontainer-utils-bash-completion.tmpl \
-             devcontainer-utils-bash-completion.tmpl \
-    /opt/devcontainer/bin/bash/completion.tmpl.sh   0;
+# Install these first since we use it in `install_utility`
+update-alternatives --install /usr/bin/devcontainer-utils-parse-args                devcontainer-utils-parse-args                /opt/devcontainer/bin/parse-args.sh                    0;
+update-alternatives --install /usr/bin/devcontainer-utils-parse-args-from-docstring devcontainer-utils-parse-args-from-docstring /opt/devcontainer/bin/parse-args-from-docstring.sh     0;
+update-alternatives --install /usr/bin/devcontainer-utils-bash-completion.tmpl      devcontainer-utils-bash-completion.tmpl      /opt/devcontainer/bin/bash/completion.tmpl.sh          0;
+update-alternatives --install /usr/bin/devcontainer-utils-generate-bash-completion  devcontainer-utils-generate-bash-completion  /opt/devcontainer/bin/bash/generate-bash-completion.sh 0;
+
+# Generate a bash completion for bash-completion generating command
+devcontainer-utils-generate-bash-completion --command devcontainer-utils-generate-bash-completion --out-dir /etc/bash_completion.d;
 
-install_utility parse-args parse-args.sh;
-install_utility parse-args-from-docstring parse-args-from-docstring.sh;
 install_utility shell-is-interactive shell-is-interactive.sh;
 install_utility post-attach-command post-attach-command.sh;
 install_utility post-attach-command-entrypoint post-attach-command-entrypoint.sh;
@@ -139,6 +135,8 @@ for dir in $(for_each_user_bashrc 'echo "$(dirname "$(realpath -m "$0")")"'); do
     # Copy in default git config
     rm -f "${dir}"/.gitconfig;
     cp .gitconfig "${dir}"/.gitconfig.default;
+    # Copy in default .bash_completion
+    cp .bash_completion "${dir}"/.bash_completion;
     # Create ~/.cache, i.e. $XDG_CACHE_HOME
     mkdir -p -m 0755 "${dir}"/.cache;
     # Create ~/.cache, i.e. $XDG_CONFIG_HOME
diff --git a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
index 4b7f060af..74bd2f526 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
@@ -31,7 +31,7 @@ _${NAME}_completions() {
     COMPREPLY=();
 
     if test -z "${${NAME}_script}"; then
-        ${NAME}_script="$(which ${SCRIPT})";
+        ${NAME}_script="$(which ${CMD})";
         if test -z "${${NAME}_script}"; then return; fi
     fi
     if test -z "${${NAME}_usage}"; then
@@ -105,4 +105,4 @@ _${NAME}_completions() {
     done
 }
 
-complete -F _${NAME}_completions ${SCRIPT};
+complete -F _${NAME}_completions ${CMD};
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
new file mode 100755
index 000000000..2c688e086
--- /dev/null
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  devcontainer-utils-generate-bash-completion [OPTION]...
+#
+# Generate a bash completion script for a command.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+# Options that require values:
+#  -c,--command  <name>         Name of the command for which to generate the bash completion.
+#  -o,--out-dir  <path>         Path to the completion script output directory
+#                               (default: ${HOME}/.bash_completion.d)
+#  -t,--template <path>         Path to the bash completion script template file
+#                               (default: `which devcontainer-utils-bash-completion.tmpl`)
+
+. devcontainer-utils-parse-args-from-docstring;
+
+generate_bash_completion() {
+
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    local command="${c:-${command:?-c|--command is required}}";
+    local out_dir="$(realpath -m "${o:-${out_dir:-"${HOME}/.bash_completion.d"}}")";
+    local template="${t:-${template:-${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}}}";
+
+    if test -f "${template}"; then
+        mkdir -p "${out_dir}";
+        cat "${template}"                     \
+      | CMD="${command}"                      \
+        NAME="${command//-/_}"                \
+        envsubst '$CMD $NAME'                 \
+      | tee "${out_dir}/${command}" >/dev/null;
+    fi
+}
+
+if test -n "${devcontainer_utils_debug:-}" \
+&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+  || test -z "${devcontainer_utils_debug##*"generate-bash-completion"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+generate_bash_completion "$@";

From dbd4608710a3d87df5543f4728e509c907ab5a84 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jan 2024 16:51:32 -0800
Subject: [PATCH 053/217] rename script templates, add uninstall scripts
 templates, use devcontainer-utils-generate-bash-completion script

---
 .../bin/generate-scripts.sh                   | 44 +++++--------
 .../bin/tmpl/all.install.tmpl.sh              | 44 +++++++++++++
 .../bin/tmpl/cpp-install.tmpl.sh              | 35 -----------
 .../{cpp-build.tmpl.sh => cpp.build.tmpl.sh}  |  0
 .../{cpp-clean.tmpl.sh => cpp.clean.tmpl.sh}  |  0
 ...onfigure.tmpl.sh => cpp.configure.tmpl.sh} |  6 +-
 .../{cpp-cpack.tmpl.sh => cpp.cpack.tmpl.sh}  |  0
 .../bin/tmpl/cpp.install.tmpl.sh              | 61 +++++++++++++++++++
 ...ninstall.tmpl.sh => cpp.uninstall.tmpl.sh} |  5 +-
 ....tmpl.sh => python.build.editable.tmpl.sh} |  4 +-
 ...hon-build.tmpl.sh => python.build.tmpl.sh} |  0
 ...eel.tmpl.sh => python.build.wheel.tmpl.sh} |  4 +-
 ...hon-clean.tmpl.sh => python.clean.tmpl.sh} |  0
 ...stall.tmpl.sh => python.uninstall.tmpl.sh} |  0
 .../{build.tmpl.sh => repo.build.tmpl.sh}     |  0
 .../{clean.tmpl.sh => repo.clean.tmpl.sh}     |  0
 .../{clone.tmpl.sh => repo.clone.tmpl.sh}     |  0
 ...nfigure.tmpl.sh => repo.configure.tmpl.sh} |  0
 .../bin/tmpl/repo.install.tmpl.sh             | 42 +++++++++++++
 ...install.tmpl.sh => repo.uninstall.tmpl.sh} |  8 +--
 20 files changed, 175 insertions(+), 78 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{cpp-build.tmpl.sh => cpp.build.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{cpp-clean.tmpl.sh => cpp.clean.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{cpp-configure.tmpl.sh => cpp.configure.tmpl.sh} (94%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{cpp-cpack.tmpl.sh => cpp.cpack.tmpl.sh} (100%)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{cpp-uninstall.tmpl.sh => cpp.uninstall.tmpl.sh} (90%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{python-build-editable.tmpl.sh => python.build.editable.tmpl.sh} (97%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{python-build.tmpl.sh => python.build.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{python-build-wheel.tmpl.sh => python.build.wheel.tmpl.sh} (98%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{python-clean.tmpl.sh => python.clean.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{python-uninstall.tmpl.sh => python.uninstall.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{build.tmpl.sh => repo.build.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{clean.tmpl.sh => repo.clean.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{clone.tmpl.sh => repo.clone.tmpl.sh} (100%)
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{configure.tmpl.sh => repo.configure.tmpl.sh} (100%)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/{uninstall.tmpl.sh => repo.uninstall.tmpl.sh} (74%)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 67c695196..e3db97f17 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -3,13 +3,12 @@
 ALT_SCRIPT_DIR="${ALT_SCRIPT_DIR:-/usr/bin}";
 TEMPLATES="${TEMPLATES:-/opt/rapids-build-utils/bin/tmpl}";
 TMP_SCRIPT_DIR="${TMP_SCRIPT_DIR:-/tmp/rapids-build-utils}";
-COMPLETION_TMPL="${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}";
 
 clean_scripts() {
     set -euo pipefail;
-    mkdir -p "${TMP_SCRIPT_DIR}";
+    mkdir -p "${TMP_SCRIPT_DIR}" ~/.bash_completion.d;
     find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \; \
-  | xargs -r -I% sudo rm -f "${TMP_SCRIPT_DIR}"/% /etc/bash_completion.d/%;
+  | xargs -r -I% rm -f "${TMP_SCRIPT_DIR}"/% ~/.bash_completion.d/%;
 }
 
 generate_script() {
@@ -44,14 +43,7 @@ generate_script() {
                 sudo ln -sf "${TMP_SCRIPT_DIR}/${bin,,}" "${ALT_SCRIPT_DIR}/${bin,,}";
             fi
 
-            if test -f "${COMPLETION_TMPL}"; then
-                cat "${COMPLETION_TMPL}"                \
-              | SCRIPT="${bin}"                         \
-                NAME="${bin//-/_}"                      \
-                envsubst '$SCRIPT $NAME'                \
-              | sudo tee "/etc/bash_completion.d/${bin}" >/dev/null;
-            fi
-
+            devcontainer-utils-generate-bash-completion --command "${bin}" --out-dir ~/.bash_completion.d;
         ) & true;
 
         echo "$!"
@@ -71,13 +63,7 @@ generate_all_script_impl() {
 
             sudo ln -sf "${TMP_SCRIPT_DIR}/${bin}" "${ALT_SCRIPT_DIR}/${bin}";
 
-            if test -f "${COMPLETION_TMPL}"; then
-                cat "${COMPLETION_TMPL}"                \
-              | SCRIPT="${bin}"                         \
-                NAME="${bin//-/_}"                      \
-                envsubst '$SCRIPT $NAME'                \
-              | sudo tee "/etc/bash_completion.d/${bin}" >/dev/null;
-            fi
+            devcontainer-utils-generate-bash-completion --command "${bin}" --out-dir ~/.bash_completion.d;
         ) & true;
 
         echo "$!"
@@ -97,8 +83,8 @@ generate_all_script() {
 }
 
 generate_clone_script() {
-    if test -f "${TEMPLATES}/clone.tmpl.sh"; then (
-        cat "${TEMPLATES}/clone.tmpl.sh" \
+    if test -f "${TEMPLATES}/repo.clone.tmpl.sh"; then (
+        cat "${TEMPLATES}/repo.clone.tmpl.sh" \
       | generate_script "clone-${NAME}"  ;
     ) || true;
     fi
@@ -106,9 +92,9 @@ generate_clone_script() {
 
 generate_repo_scripts() {
     local script_name;
-    for script_name in "configure" "build" "clean" "uninstall"; do
-        if test -f "${TEMPLATES}/${script_name}.tmpl.sh"; then (
-            cat "${TEMPLATES}/${script_name}.tmpl.sh" \
+    for script_name in "configure" "build" "clean" "install" "uninstall"; do
+        if test -f "${TEMPLATES}/repo.${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/repo.${script_name}.tmpl.sh" \
           | generate_script "${script_name}-${NAME}"  ;
         ) || true;
         fi
@@ -118,8 +104,8 @@ generate_repo_scripts() {
 generate_cpp_scripts() {
     local script_name;
     for script_name in "clean" "configure" "build" "cpack" "install" "uninstall"; do
-        if test -f "${TEMPLATES}/cpp-${script_name}.tmpl.sh"; then (
-            cat "${TEMPLATES}/cpp-${script_name}.tmpl.sh"  \
+        if test -f "${TEMPLATES}/cpp.${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/cpp.${script_name}.tmpl.sh"  \
           | CPP_SRC="${SRC_PATH:-}${CPP_SRC:+/$CPP_SRC}"   \
             generate_script "${script_name}-${CPP_LIB}-cpp";
         ) || true;
@@ -130,15 +116,15 @@ generate_cpp_scripts() {
 generate_python_scripts() {
     local script_name;
     for script_name in "build" "clean" "uninstall"; do
-        if test -f "${TEMPLATES}/python-${script_name}.tmpl.sh"; then (
-            cat "${TEMPLATES}/python-${script_name}.tmpl.sh" \
+        if test -f "${TEMPLATES}/python.${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/python.${script_name}.tmpl.sh" \
           | generate_script "${script_name}-${PY_LIB}-python";
         ) || true;
         fi
     done
     for script_name in "editable" "wheel"; do
-        if test -f "${TEMPLATES}/python-build-${script_name}.tmpl.sh"; then (
-            cat "${TEMPLATES}/python-build-${script_name}.tmpl.sh" \
+        if test -f "${TEMPLATES}/python.build.${script_name}.tmpl.sh"; then (
+            cat "${TEMPLATES}/python.build.${script_name}.tmpl.sh" \
           | generate_script "build-${PY_LIB}-python-${script_name}";
         ) || true;
         fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
new file mode 100755
index 000000000..c7af7f098
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  install-all [OPTION]...
+#
+# Runs install-<repo> for each repo in "${NAMES}".
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
+#  --strip                      Strip before installing.
+#
+# Options that require values:
+#  -p,--prefix <dir>                            Install C++ library into <dir>
+#                                               (default: none)
+#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
+#                                               (default: none)
+#  --component <comp>                           Component-based install. Only install component <comp>.
+#                                               (default: all)
+#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+
+. devcontainer-utils-parse-args-from-docstring;
+
+install_all() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    for name in ${NAMES}; do
+        if type install-${name} >/dev/null 2>&1; then
+            install-${name} "$@";
+        fi
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-all"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+install_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
deleted file mode 100755
index 121cf9f1e..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-install.tmpl.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-# Usage:
-#  install-${CPP_LIB}-cpp [OPTION]...
-#
-# Install ${CPP_LIB}.
-#
-# Boolean options:
-#  -h,--help,--usage            print this text
-#  -v,--verbose                 verbose output
-#
-# Options that require values:
-#  -p,--prefix <dir>            install C++ library into <dir>
-#                               (default: none)
-
-. devcontainer-utils-parse-args-from-docstring;
-
-install_${CPP_LIB}_cpp() {
-    set -Eeuo pipefail;
-
-    parse_args_or_show_help - <<< "$@";
-
-    time (
-        cmake --install "${CPP_SRC}"/build/latest/ "$@";
-        { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} install time:";
-    ) 2>&1;
-}
-
-if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}" ); then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
-install_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-build.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-clean.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
similarity index 94%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 6ac4df3b5..54143f79a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -6,8 +6,8 @@
 # Configure ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
-#  -v,--verbose                 verbose output
+#  -h,--help,--usage                      print this text
+#  -v,--verbose                           verbose output
 #
 # Options that require values:
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
@@ -62,7 +62,7 @@ configure_${CPP_LIB}_cpp() {
     cmake_args+=(${__rest__[@]});
 
     time (
-        CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t${n_arch}" \
+        CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
             cmake ${cmake_args[@]};
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} configure time:";
     ) 2>&1;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-cpack.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
new file mode 100755
index 000000000..2824a5387
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  install-${CPP_LIB}-cpp [OPTION]...
+#
+# Install ${CPP_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 Enable verbose output.
+#  --strip                      Strip before installing.
+#
+# Options that require values:
+#  -p,--prefix <dir>                            Install C++ library into <dir>
+#                                               (default: none)
+#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
+#                                               (default: none)
+#  --component <comp>                           Component-based install. Only install component <comp>.
+#                                               (default: all)
+#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+
+. devcontainer-utils-parse-args-from-docstring;
+
+install_${CPP_LIB}_cpp() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    local strip="${strip:-}";
+    local verbose="${v:-${verbose:-}}";
+    local config="${config:+--config "${config}"}";
+    local components=(${component[@]:-all}); unset component;
+    local prefix="${p:-${prefix:-${CMAKE_INSTALL_PREFIX:-/usr/local}}}";
+    local default_directory_permissions="${default_directory_permissions:+--default-directory-permissions "${default_directory_permissions}"}";
+
+    for ((i=0; i < ${#components[@]}; i+=1)); do
+        local component="${components[$i]}";
+        if test "all" = "${component}"; then
+            component="";
+        fi
+        time (
+            cmake \
+                --install "${CPP_SRC}"/build/latest/     \
+                ${strip:+--strip}                        \
+                ${verbose:+--verbose}                    \
+                ${prefix:+--prefix "${prefix}"}          \
+                ${default_directory_permissions}         \
+                ${component:+--component "${component}"} \
+                ;
+            { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB}${component:+ $component} install time:";
+        ) 2>&1;
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+install_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
similarity index 90%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 8f8d3ce27..68e4e93bf 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp-uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -6,9 +6,8 @@
 # Uninstall ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
-#  -v,--verbose                 verbose output
-#
+#  -h,--help,--usage  print this text
+#  -v,--verbose       verbose output
 
 . devcontainer-utils-parse-args-from-docstring;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
similarity index 97%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index 60b71c46d..e16c621d6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -75,8 +75,8 @@ build_${PY_LIB}_python_editable() {
     time (
         export ${PY_ENV} PATH="$PATH";
 
-        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t${n_arch}";
-        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t${n_arch}";
+        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
+        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
 
         CUDAFLAGS="${cudaflags}"                     \
         CMAKE_GENERATOR="Ninja"                      \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
similarity index 98%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 87b6fb21c..9219166fa 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-build-wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -148,8 +148,8 @@ build_${PY_LIB}_python_wheel() {
     time (
         export ${PY_ENV} PATH="$PATH";
 
-        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t${n_arch}";
-        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t${n_arch}";
+        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
+        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
 
         CUDAFLAGS="${cudaflags}"                 \
         CMAKE_GENERATOR="Ninja"                  \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-clean.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python-uninstall.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/build.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clean.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/clone.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
similarity index 100%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/configure.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
new file mode 100755
index 000000000..3f0c9bc87
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  install-${NAME} [OPTION]...
+#
+# Install ${CPP_LIB} and ${PY_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage  print this text
+#  -v,--verbose       verbose output
+#  --strip                      Strip before installing.
+#
+# Options that require values:
+#  -p,--prefix <dir>                            Install C++ library into <dir>
+#                                               (default: none)
+#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
+#                                               (default: none)
+#  --component <comp>                           Component-based install. Only install component <comp>.
+#                                               (default: all)
+#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+
+. devcontainer-utils-parse-args-from-docstring;
+
+install_${NAME}() {
+    set -Eeuo pipefail;
+
+    parse_args_or_show_help - <<< "$@";
+
+    for lib in ${CPP_LIB}; do
+        if type install-${lib}-cpp >/dev/null 2>&1; then
+            install-${lib}-cpp "$@";
+        fi
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-${NAME}"*}" ); then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+install_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
similarity index 74%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/uninstall.tmpl.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index 841811625..3b68afb01 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -6,8 +6,8 @@
 # Uninstall ${CPP_LIB} and ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
-#  -v,--verbose                           verbose output
+#  -h,--help,--usage  print this text
+#  -v,--verbose       verbose output
 
 . devcontainer-utils-parse-args-from-docstring;
 
@@ -18,13 +18,13 @@ uninstall_${NAME}() {
 
     for lib in ${CPP_LIB}; do
         if type uninstall-${lib}-cpp >/dev/null 2>&1; then
-            uninstall-${lib}-cpp ${__rest__[@]};
+            uninstall-${lib}-cpp "$@";
         fi
     done
 
     for lib in ${PY_LIB}; do
         if type uninstall-${lib}-python >/dev/null 2>&1; then
-            uninstall-${lib}-python --type ${t:-${type:-"editable"}} ${__rest__[@]};
+            uninstall-${lib}-python "$@";
         fi
     done
 }

From e800b4a8c5a295f27bf30485390490c11a7e045e Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Tue, 23 Jan 2024 21:56:54 -0800
Subject: [PATCH 054/217] ensure newlines in known_hosts (#214)

---
 features/src/utils/install.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 9a92366a0..28efbe139 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -120,11 +120,10 @@ append_to_all_bashrcs "$(cat .bashrc)";
 # export envvars in /etc/profile.d
 add_etc_profile_d_script devcontainer-utils "$(cat .bashrc)";
 
-known_hosts="";
 # Add GitHub's key fingerprints to known_hosts
-known_hosts="$(curl -s https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]' || echo "")";
 # Add GitLab's key fingerprints to known_hosts (https://docs.gitlab.com/ee/user/gitlab_com/index.html#ssh-known_hosts-entries)
-known_hosts+="$(cat <<EOF
+known_hosts="$(cat <<EOF
+$(curl -s https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]' || echo "")
 gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
 gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
 gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=

From 11ff5d11531375437ed9c463174e5d48111d456f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jan 2024 22:17:25 -0800
Subject: [PATCH 055/217] bump feature version

---
 features/src/utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index 40820dba5..4f65dd511 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.2.4",
+  "version": "24.2.5",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

From 0f9d922028197bc55943c125a5121702ec1109f8 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jan 2024 23:46:19 -0800
Subject: [PATCH 056/217] error if curl fails

---
 features/src/utils/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 28efbe139..7dd564efe 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -123,7 +123,7 @@ add_etc_profile_d_script devcontainer-utils "$(cat .bashrc)";
 # Add GitHub's key fingerprints to known_hosts
 # Add GitLab's key fingerprints to known_hosts (https://docs.gitlab.com/ee/user/gitlab_com/index.html#ssh-known_hosts-entries)
 known_hosts="$(cat <<EOF
-$(curl -s https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]' || echo "")
+$(curl -s https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]')
 gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
 gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
 gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=

From d3d6f0e72c21d29854b30ada10d8c71b43c16f3e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 23 Jan 2024 23:48:12 -0800
Subject: [PATCH 057/217] bump feature version

---
 features/src/utils/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index 4f65dd511..1d6ecc207 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.2.5",
+  "version": "24.2.6",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

From 289bb66282eb2fd0d4b1a70e682314a54a4ee88c Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Wed, 24 Jan 2024 01:50:41 -0800
Subject: [PATCH 058/217] retry api.github.com/meta requests (#215)

* retry api.github.com/meta requests

* pipefail
---
 features/src/utils/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 7dd564efe..d3afe34ce 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -e
+set -eo pipefail
 
 # Ensure we're in this feature's directory during build
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
@@ -123,7 +123,7 @@ add_etc_profile_d_script devcontainer-utils "$(cat .bashrc)";
 # Add GitHub's key fingerprints to known_hosts
 # Add GitLab's key fingerprints to known_hosts (https://docs.gitlab.com/ee/user/gitlab_com/index.html#ssh-known_hosts-entries)
 known_hosts="$(cat <<EOF
-$(curl -s https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]')
+$(curl -s -f --retry 10 --retry-connrefused https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]')
 gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
 gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
 gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=

From 8701297c45fa2d075fc1eea3227a142e14850edc Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 24 Jan 2024 02:38:19 -0800
Subject: [PATCH 059/217] inline github fingerprints

---
 features/src/utils/devcontainer-feature.json | 2 +-
 features/src/utils/install.sh                | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index 1d6ecc207..471a96e46 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.2.6",
+  "version": "24.2.7",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index d3afe34ce..eff9ca138 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -eo pipefail
+set -e
 
 # Ensure we're in this feature's directory during build
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
@@ -120,10 +120,12 @@ append_to_all_bashrcs "$(cat .bashrc)";
 # export envvars in /etc/profile.d
 add_etc_profile_d_script devcontainer-utils "$(cat .bashrc)";
 
-# Add GitHub's key fingerprints to known_hosts
+# Add GitHub's key fingerprints to known_hosts (curl -s https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]')
 # Add GitLab's key fingerprints to known_hosts (https://docs.gitlab.com/ee/user/gitlab_com/index.html#ssh-known_hosts-entries)
 known_hosts="$(cat <<EOF
-$(curl -s -f --retry 10 --retry-connrefused https://api.github.com/meta | jq -r '.ssh_keys | map("github.com \(.)") | .[]')
+github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
 gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
 gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
 gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=

From 872f1b2e0f65fb1aa850fa6326642a609a554201 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 28 Jan 2024 12:57:29 -0800
Subject: [PATCH 060/217] fix shellcheck lint

---
 features/common/install.sh                    | 25 +++++++++++---
 features/common/utilities.sh                  | 34 ++++++++++++-------
 features/src/cccl-dev/common/install.sh       | 25 +++++++++++---
 features/src/cccl-dev/common/utilities.sh     | 34 ++++++++++++-------
 .../src/cccl-dev/devcontainer-feature.json    |  2 +-
 features/src/cmake/common/install.sh          | 25 +++++++++++---
 features/src/cmake/common/utilities.sh        | 34 ++++++++++++-------
 features/src/cmake/devcontainer-feature.json  |  2 +-
 features/src/cuda/common/install.sh           | 25 +++++++++++---
 features/src/cuda/common/utilities.sh         | 34 ++++++++++++-------
 features/src/cuda/devcontainer-feature.json   |  2 +-
 features/src/gcc/common/install.sh            | 25 +++++++++++---
 features/src/gcc/common/utilities.sh          | 34 ++++++++++++-------
 features/src/gcc/devcontainer-feature.json    |  2 +-
 features/src/gitlab-cli/common/install.sh     | 25 +++++++++++---
 features/src/gitlab-cli/common/utilities.sh   | 34 ++++++++++++-------
 .../src/gitlab-cli/devcontainer-feature.json  |  2 +-
 features/src/llvm/common/install.sh           | 25 +++++++++++---
 features/src/llvm/common/utilities.sh         | 34 ++++++++++++-------
 features/src/llvm/devcontainer-feature.json   |  2 +-
 features/src/mambaforge/common/install.sh     | 25 +++++++++++---
 features/src/mambaforge/common/utilities.sh   | 34 ++++++++++++-------
 .../src/mambaforge/devcontainer-feature.json  |  2 +-
 features/src/ninja/common/install.sh          | 25 +++++++++++---
 features/src/ninja/common/utilities.sh        | 34 ++++++++++++-------
 features/src/ninja/devcontainer-feature.json  |  2 +-
 features/src/nvhpc/common/install.sh          | 25 +++++++++++---
 features/src/nvhpc/common/utilities.sh        | 34 ++++++++++++-------
 features/src/nvhpc/devcontainer-feature.json  |  2 +-
 features/src/oneapi/common/install.sh         | 25 +++++++++++---
 features/src/oneapi/common/utilities.sh       | 34 ++++++++++++-------
 features/src/oneapi/devcontainer-feature.json |  2 +-
 features/src/oneapi/etc/profile.d/oneapi.sh   |  2 +-
 .../src/rapids-build-utils/common/install.sh  | 25 +++++++++++---
 .../rapids-build-utils/common/utilities.sh    | 34 ++++++++++++-------
 features/src/rust/common/install.sh           | 25 +++++++++++---
 features/src/rust/common/utilities.sh         | 34 ++++++++++++-------
 features/src/rust/devcontainer-feature.json   |  2 +-
 features/src/sccache/common/install.sh        | 25 +++++++++++---
 features/src/sccache/common/utilities.sh      | 34 ++++++++++++-------
 .../src/sccache/devcontainer-feature.json     |  2 +-
 features/src/ucx/common/install.sh            | 25 +++++++++++---
 features/src/ucx/common/utilities.sh          | 34 ++++++++++++-------
 features/src/ucx/devcontainer-feature.json    |  2 +-
 features/src/utils/common/install.sh          | 25 +++++++++++---
 features/src/utils/common/utilities.sh        | 34 ++++++++++++-------
 46 files changed, 686 insertions(+), 286 deletions(-)

diff --git a/features/common/install.sh b/features/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/common/install.sh
+++ b/features/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/common/utilities.sh b/features/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/common/utilities.sh
+++ b/features/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/cccl-dev/common/install.sh b/features/src/cccl-dev/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/cccl-dev/common/install.sh
+++ b/features/src/cccl-dev/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/cccl-dev/common/utilities.sh b/features/src/cccl-dev/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/cccl-dev/common/utilities.sh
+++ b/features/src/cccl-dev/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
index 58df0dd8f..c7428f3c9 100644
--- a/features/src/cccl-dev/devcontainer-feature.json
+++ b/features/src/cccl-dev/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA CCCL development utilities",
   "id": "cccl-dev",
-  "version": "24.2.2",
+  "version": "24.2.3",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {
diff --git a/features/src/cmake/common/install.sh b/features/src/cmake/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/cmake/common/install.sh
+++ b/features/src/cmake/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/cmake/common/utilities.sh b/features/src/cmake/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/cmake/common/utilities.sh
+++ b/features/src/cmake/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/cmake/devcontainer-feature.json b/features/src/cmake/devcontainer-feature.json
index 66943ae58..0612c892f 100644
--- a/features/src/cmake/devcontainer-feature.json
+++ b/features/src/cmake/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CMake",
   "id": "cmake",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install CMake",
   "options": {
     "version": {
diff --git a/features/src/cuda/common/install.sh b/features/src/cuda/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/cuda/common/install.sh
+++ b/features/src/cuda/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/cuda/common/utilities.sh b/features/src/cuda/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/cuda/common/utilities.sh
+++ b/features/src/cuda/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
index fd6868410..9120c96c3 100644
--- a/features/src/cuda/devcontainer-feature.json
+++ b/features/src/cuda/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CUDA Toolkit",
   "id": "cuda",
-  "version": "24.2.2",
+  "version": "24.2.3",
   "description": "A feature to install the NVIDIA CUDA Toolkit",
   "options": {
     "version": {
diff --git a/features/src/gcc/common/install.sh b/features/src/gcc/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/gcc/common/install.sh
+++ b/features/src/gcc/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/gcc/common/utilities.sh b/features/src/gcc/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/gcc/common/utilities.sh
+++ b/features/src/gcc/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json
index 8b609468d..6d8ecfca4 100644
--- a/features/src/gcc/devcontainer-feature.json
+++ b/features/src/gcc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "GCC",
   "id": "gcc",
-  "version": "24.2.1",
+  "version": "24.2.2",
   "description": "A feature to install gcc",
   "options": {
     "version": {
diff --git a/features/src/gitlab-cli/common/install.sh b/features/src/gitlab-cli/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/gitlab-cli/common/install.sh
+++ b/features/src/gitlab-cli/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/gitlab-cli/common/utilities.sh b/features/src/gitlab-cli/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/gitlab-cli/common/utilities.sh
+++ b/features/src/gitlab-cli/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/gitlab-cli/devcontainer-feature.json b/features/src/gitlab-cli/devcontainer-feature.json
index 0642d4ecc..c74b72c7c 100644
--- a/features/src/gitlab-cli/devcontainer-feature.json
+++ b/features/src/gitlab-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "gitlab-cli",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "name": "GitLab CLI",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/gitlab-cli",
   "description": "Installs the GitLab CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/features/src/llvm/common/install.sh b/features/src/llvm/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/llvm/common/install.sh
+++ b/features/src/llvm/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/llvm/common/utilities.sh b/features/src/llvm/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/llvm/common/utilities.sh
+++ b/features/src/llvm/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/llvm/devcontainer-feature.json b/features/src/llvm/devcontainer-feature.json
index 62dd3b96c..9687c599c 100644
--- a/features/src/llvm/devcontainer-feature.json
+++ b/features/src/llvm/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "LLVM compilers and tools",
   "id": "llvm",
-  "version": "24.2.3",
+  "version": "24.2.4",
   "description": "A feature to install LLVM compilers and tools",
   "options": {
     "version": {
diff --git a/features/src/mambaforge/common/install.sh b/features/src/mambaforge/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/mambaforge/common/install.sh
+++ b/features/src/mambaforge/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/mambaforge/common/utilities.sh b/features/src/mambaforge/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/mambaforge/common/utilities.sh
+++ b/features/src/mambaforge/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/mambaforge/devcontainer-feature.json b/features/src/mambaforge/devcontainer-feature.json
index 4dcbaad12..d35147a02 100644
--- a/features/src/mambaforge/devcontainer-feature.json
+++ b/features/src/mambaforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Mambaforge",
   "id": "mambaforge",
-  "version": "24.2.1",
+  "version": "24.2.2",
   "description": "A feature to install mambaforge",
   "options": {
     "version": {
diff --git a/features/src/ninja/common/install.sh b/features/src/ninja/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/ninja/common/install.sh
+++ b/features/src/ninja/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/ninja/common/utilities.sh b/features/src/ninja/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/ninja/common/utilities.sh
+++ b/features/src/ninja/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/ninja/devcontainer-feature.json b/features/src/ninja/devcontainer-feature.json
index a3b7ca1f6..63f0835c1 100644
--- a/features/src/ninja/devcontainer-feature.json
+++ b/features/src/ninja/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Ninja build",
   "id": "ninja",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install ninja-build",
   "options": {
     "version": {
diff --git a/features/src/nvhpc/common/install.sh b/features/src/nvhpc/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/nvhpc/common/install.sh
+++ b/features/src/nvhpc/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/nvhpc/common/utilities.sh b/features/src/nvhpc/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/nvhpc/common/utilities.sh
+++ b/features/src/nvhpc/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json
index ec292fc24..5f68a3299 100644
--- a/features/src/nvhpc/devcontainer-feature.json
+++ b/features/src/nvhpc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVHPC SDK",
   "id": "nvhpc",
-  "version": "24.2.2",
+  "version": "24.2.3",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "version": {
diff --git a/features/src/oneapi/common/install.sh b/features/src/oneapi/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/oneapi/common/install.sh
+++ b/features/src/oneapi/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/oneapi/common/utilities.sh b/features/src/oneapi/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/oneapi/common/utilities.sh
+++ b/features/src/oneapi/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/oneapi/devcontainer-feature.json b/features/src/oneapi/devcontainer-feature.json
index 3ee97e75f..f0df30a5b 100644
--- a/features/src/oneapi/devcontainer-feature.json
+++ b/features/src/oneapi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Intel oneapi toolchain",
   "id": "oneapi",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install the Intel oneapi toolchain",
   "options": {
     "version": {
diff --git a/features/src/oneapi/etc/profile.d/oneapi.sh b/features/src/oneapi/etc/profile.d/oneapi.sh
index 69bbd0ae8..a49e41684 100644
--- a/features/src/oneapi/etc/profile.d/oneapi.sh
+++ b/features/src/oneapi/etc/profile.d/oneapi.sh
@@ -4,7 +4,7 @@ fi
 
 if [ -n "${PATH##*"/opt/intel/oneapi/compiler/${ICC_VERSION}/linux/bin"*}" ]; then
     if test -f /opt/intel/oneapi/setvars.sh; then
-        . /opt/intel/oneapi/setvars.sh --force 2>&1 >/dev/null;
+        . /opt/intel/oneapi/setvars.sh --force >/dev/null 2>&1;
     else
         module use "/opt/intel/oneapi/compiler/${ICC_VERSION}/modulefiles";
         module use "/opt/intel/oneapi/compiler/${ICC_VERSION}/linux/lib/oclfpga/modulefiles";
diff --git a/features/src/rapids-build-utils/common/install.sh b/features/src/rapids-build-utils/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/rapids-build-utils/common/install.sh
+++ b/features/src/rapids-build-utils/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/rapids-build-utils/common/utilities.sh b/features/src/rapids-build-utils/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/rapids-build-utils/common/utilities.sh
+++ b/features/src/rapids-build-utils/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/rust/common/install.sh b/features/src/rust/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/rust/common/install.sh
+++ b/features/src/rust/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/rust/common/utilities.sh b/features/src/rust/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/rust/common/utilities.sh
+++ b/features/src/rust/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/rust/devcontainer-feature.json b/features/src/rust/devcontainer-feature.json
index 03429f32d..085949ee5 100644
--- a/features/src/rust/devcontainer-feature.json
+++ b/features/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "rust",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "name": "Rust",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/rust",
   "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/features/src/sccache/common/install.sh b/features/src/sccache/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/sccache/common/install.sh
+++ b/features/src/sccache/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/sccache/common/utilities.sh b/features/src/sccache/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/sccache/common/utilities.sh
+++ b/features/src/sccache/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/sccache/devcontainer-feature.json b/features/src/sccache/devcontainer-feature.json
index 712449541..c00c6c657 100644
--- a/features/src/sccache/devcontainer-feature.json
+++ b/features/src/sccache/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "sccache",
   "id": "sccache",
-  "version": "24.2.1",
+  "version": "24.2.2",
   "description": "A feature to install sccache",
   "options": {
     "version": {
diff --git a/features/src/ucx/common/install.sh b/features/src/ucx/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/ucx/common/install.sh
+++ b/features/src/ucx/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/ucx/common/utilities.sh b/features/src/ucx/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/ucx/common/utilities.sh
+++ b/features/src/ucx/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi
diff --git a/features/src/ucx/devcontainer-feature.json b/features/src/ucx/devcontainer-feature.json
index 6f21df041..133d83efa 100644
--- a/features/src/ucx/devcontainer-feature.json
+++ b/features/src/ucx/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "UCX",
   "id": "ucx",
-  "version": "24.2.0",
+  "version": "24.2.1",
   "description": "A feature to install UCX",
   "options": {
     "version": {
diff --git a/features/src/utils/common/install.sh b/features/src/utils/common/install.sh
index aadbfc321..9500eaa77 100755
--- a/features/src/utils/common/install.sh
+++ b/features/src/utils/common/install.sh
@@ -9,6 +9,7 @@ fi
 src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # export bash utility functions
+# shellcheck disable=SC1091
 source "$src/utilities.sh";
 
 # install /etc/skel
@@ -33,12 +34,28 @@ if ! grep -qE '^BASH_ENV=/etc/bash.bash_env$' /etc/environment; then
 fi
 
 # Remove unnecessary "$HOME/.local/bin" at the end of the path
+# shellcheck disable=SC2016
 if grep -qxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' /etc/bash.bashrc; then
-   cat /etc/bash.bashrc \
- | grep -vxF 'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
- > /etc/bash.bashrc.new \
-&& mv /etc/bash.bashrc{.new,};
+   grep -vxF \
+    'if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi' \
+    /etc/bash.bashrc \
+    > /etc/bash.bashrc.new \
+ && mv /etc/bash.bashrc{.new,};
 fi
 
 cp /etc/skel/.profile /root/.profile;
 echo 'mesg n 2> /dev/null || true' >> /root/.profile;
+
+for_each_user_profile "$(cat <<"EOF"
+sed -i 's@if \[ -d "$HOME/bin" \]@if [ -n "${PATH##*"$HOME/bin"*}" ] \&\& [ -d "$HOME/bin" ]@' $0;
+sed -i 's@if \[ -d "$HOME/.local/bin" \]@if [ -n "${PATH##*"$HOME/.local/bin"*}" ] \&\& [ -d "$HOME/.local/bin" ]@' $0;
+EOF
+)";
+
+# Fix the devcontainers/features/common-utils __bash_prompt fn
+# shellcheck disable=SC2016
+for_each_user_bashrc '
+if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
+    sed -i "s/\${GITHUB_USER}/\${GITHUB_USER:-}/g" "$0";
+fi
+';
diff --git a/features/src/utils/common/utilities.sh b/features/src/utils/common/utilities.sh
index fd21d4fea..73f4d2c19 100644
--- a/features/src/utils/common/utilities.sh
+++ b/features/src/utils/common/utilities.sh
@@ -16,7 +16,7 @@ export -f apt_get_update;
 check_packages() {
     if ! dpkg -s "$@" > /dev/null 2>&1; then
         apt_get_update;
-        echo "Installing packages: $@";
+        echo "Installing packages: $*";
         DEBIAN_FRONTEND=noninteractive \
         apt-get -y install --no-install-recommends "$@";
     fi
@@ -26,15 +26,23 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
 export -f for_each_user_bashrc;
 
+for_each_user_profile() {
+    # Update all .profile files
+    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+  | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
+}
+
+export -f for_each_user_profile;
+
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -46,7 +54,7 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
@@ -112,7 +120,7 @@ export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
     local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
-    echo -e "#! /usr/bin/env bash\n${@:2}" > "/etc/profile.d/${name}";
+    echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
 
@@ -146,12 +154,12 @@ find_version_from_git_tags() {
             fi
         fi
         local regex="${prefix}\\K[0-9]+${last_part}$"
-        local version_list="$(git ls-remote --tags ${repository} | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
+        local -r version_list="$(git ls-remote --tags "${repository}" | grep -oP "${regex}" | tr -d ' ' | tr "${separator}" "." | sort -rV)"
         if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ] || [ "${requested_version}" = "lts" ]; then
-            declare -g ${variable_name}="$(echo "${version_list}" | head -n 1)"
+            declare -g "${variable_name}"="$(echo "${version_list}" | head -n 1)"
         else
             set +e
-            declare -g ${variable_name}="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
+            declare -g "${variable_name}"="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
             set -e
         fi
     fi
@@ -185,21 +193,21 @@ find_prev_version_from_git_tags() {
 
         if [ "${minor}" = "0" ] && [ "${breakfix}" = "0" ]; then
             ((major=major-1))
-            declare -g ${variable_name}="${major}"
+            declare -g "${variable_name}"="${major}"
             # Look for latest version from previous major release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         # Handle situations like Go's odd version pattern where "0" releases omit the last part
         elif [ "${breakfix}" = "" ] || [ "${breakfix}" = "0" ]; then
             ((minor=minor-1))
-            declare -g ${variable_name}="${major}.${minor}"
+            declare -g "${variable_name}"="${major}.${minor}"
             # Look for latest version from previous minor release
             find_version_from_git_tags "${variable_name}" "${repository}" "${prefix}" "${separator}" "${version_suffix_regex}" "${last_part_optional}"
         else
             ((breakfix=breakfix-1))
             if [ "${breakfix}" = "0" ] && [ "${last_part_optional}" = "true" ]; then
-                declare -g ${variable_name}="${major}.${minor}"
+                declare -g "${variable_name}"="${major}.${minor}"
             else
-                declare -g ${variable_name}="${major}.${minor}.${breakfix}"
+                declare -g "${variable_name}"="${major}.${minor}.${breakfix}"
             fi
         fi
     set -e
@@ -214,7 +222,7 @@ find_non_root_user() {
         USERNAME=""
         POSSIBLE_USERS=("vscode" "node" "codespace" "coder" "$(awk -v val=1001 -F ":" '$3==val{print $1}' /etc/passwd)")
         for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
-            if id -u ${CURRENT_USER} > /dev/null 2>&1; then
+            if id -u "${CURRENT_USER}" > /dev/null 2>&1; then
                 USERNAME=${CURRENT_USER}
                 break
             fi

From e33420ff8b01a178617c5e7bf592145e5ee58a54 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 28 Jan 2024 20:57:59 -0800
Subject: [PATCH 061/217] fix shellcheck lint, rewrite parse-args to use
 getopts, add cpack-all and cpack-<repo> scripts

---
 .../bin/checkout-same-branch.sh               |  69 ++--
 .../bin/generate-scripts.sh                   | 182 ++++++---
 .../bin/get-num-archs-jobs-and-load.sh        |  37 +-
 .../opt/rapids-build-utils/bin/list-repos.sh  |  42 +-
 .../bin/make-conda-dependencies.sh            |  37 +-
 .../rapids-build-utils/bin/make-conda-env.sh  |  26 +-
 .../bin/make-pip-dependencies.sh              |  53 ++-
 .../rapids-build-utils/bin/make-pip-env.sh    |  45 ++-
 .../bin/make-vscode-workspace.sh              |  13 +-
 .../bin/parse-cmake-args.sh                   |   4 +-
 .../bin/parse-cmake-build-type.sh             |   2 +-
 .../bin/parse-cmake-var-from-args.sh          |   2 +-
 .../bin/parse-cmake-vars-from-args.sh         |   4 +-
 .../bin/parse-valid-args.sh                   |  14 +-
 .../bin/post-attach-command.sh                |   2 +-
 .../bin/pull-repositories.sh                  |  29 +-
 .../bin/push-repositories.sh                  |  17 +-
 .../bin/python-conda-pkg-names.sh             |  15 +-
 .../bin/python-pkg-names.sh                   |  11 +-
 .../bin/python-pkg-roots.sh                   |  11 +-
 .../rapids-build-utils/bin/query-manifest.sh  |  14 +-
 .../bin/tmpl/all.build.tmpl.sh                |  10 +-
 .../bin/tmpl/all.clean.tmpl.sh                |  21 +-
 .../bin/tmpl/all.clone.tmpl.sh                |  35 +-
 .../bin/tmpl/all.configure.tmpl.sh            |   8 +-
 .../bin/tmpl/all.cpack.tmpl.sh                |  40 ++
 .../bin/tmpl/all.install.tmpl.sh              |   8 +-
 .../rapids-build-utils/bin/tmpl/all.tmpl.sh   |   8 +-
 .../bin/tmpl/all.uninstall.tmpl.sh            |   8 +-
 .../bin/tmpl/cpp.build.tmpl.sh                |  17 +-
 .../bin/tmpl/cpp.clean.tmpl.sh                |  11 +-
 .../bin/tmpl/cpp.configure.tmpl.sh            |  19 +-
 .../bin/tmpl/cpp.cpack.tmpl.sh                |  14 +-
 .../bin/tmpl/cpp.install.tmpl.sh              |  41 +-
 .../bin/tmpl/cpp.uninstall.tmpl.sh            |  13 +-
 .../bin/tmpl/python.build.editable.tmpl.sh    |  19 +-
 .../bin/tmpl/python.build.tmpl.sh             |  13 +-
 .../bin/tmpl/python.build.wheel.tmpl.sh       |  24 +-
 .../bin/tmpl/python.clean.tmpl.sh             |   9 +-
 .../bin/tmpl/python.uninstall.tmpl.sh         |  13 +-
 .../bin/tmpl/repo.build.tmpl.sh               |  20 +-
 .../bin/tmpl/repo.clean.tmpl.sh               |  11 +-
 .../bin/tmpl/repo.clone.tmpl.sh               |  34 +-
 .../bin/tmpl/repo.configure.tmpl.sh           |   9 +-
 .../bin/tmpl/repo.cpack.tmpl.sh               |  35 ++
 .../bin/tmpl/repo.install.tmpl.sh             |   9 +-
 .../bin/tmpl/repo.uninstall.tmpl.sh           |   9 +-
 features/src/utils/.bash_completion           |  11 +-
 .../devcontainer/bin/bash/completion.tmpl.sh  | 159 +++++---
 .../bin/bash/generate-bash-completion.sh      |  29 +-
 .../utils/opt/devcontainer/bin/git/init.sh    |   2 +-
 .../opt/devcontainer/bin/git/repo/clone.sh    |  54 +--
 .../opt/devcontainer/bin/github/cli/init.sh   |  33 +-
 .../opt/devcontainer/bin/github/repo/clone.sh |  37 +-
 .../opt/devcontainer/bin/gitlab/cli/init.sh   |   2 +-
 .../opt/devcontainer/bin/gitlab/repo/clone.sh |  33 +-
 .../bin/parse-args-from-docstring.sh          |  85 ++--
 .../utils/opt/devcontainer/bin/parse-args.sh  | 382 +++++++++++++-----
 .../bin/post-attach-command-entrypoint.sh     |   3 +-
 .../devcontainer/bin/post-attach-command.sh   |   8 +-
 .../devcontainer/bin/ssh/init-deploy-keys.sh  |   6 +-
 .../opt/devcontainer/bin/vault/auth/github.sh |  31 +-
 .../bin/vault/s3/creds/generate.sh            |  46 +--
 .../bin/vault/s3/creds/persist.sh             |  63 +--
 .../bin/vault/s3/creds/propagate.sh           |   2 +-
 .../bin/vault/s3/creds/schedule.sh            |  10 +-
 .../devcontainer/bin/vault/s3/creds/test.sh   |   6 +-
 .../opt/devcontainer/bin/vault/s3/init.sh     |  56 ++-
 68 files changed, 1216 insertions(+), 929 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index cbb3b83c1..5e6165920 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -19,23 +19,17 @@
 #  -r,--repo <repo>      Filter the results to include <repo> entries.
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 checkout_same_branch() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
+    eval "$(                                        \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}      \
+        rapids-get-num-archs-jobs-and-load -a1 "$@" \
     )";
 
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "$@")";
 
     echo "Determining available branches...";
 
@@ -51,59 +45,60 @@ checkout_same_branch() {
         fi
         local name="${!repo_name}";
         local path="${!repo_path}";
-        repo_names+=(${name});
-        repo_paths+=(${path});
+        repo_names+=("${name}");
+        repo_paths+=("${path}");
         repo_pairs+=("${name//"-"/"_"} ${path}");
     done
 
     eval "$(
         echo -e "${repo_pairs[@]/%/\\n}"                                                              \
-      | xargs -r -P${n_jobs} -I% bash -c "                                                            \
+      | xargs -r -P"${n_jobs-}" -I% bash -c "                                                         \
         name=\$(cut -d' ' -f1 <<< \$0);                                                               \
         path=\$(cut -d' ' -f2 <<< \$0);                                                               \
-        echo \"repo_branches_\${name}_='\$(                                                           \
+        echo \"local repo_branches_\${name}_='\$(                                                     \
             cat <(git -C ~/\${path} ls-remote -h origin | cut -f2 | sed \"s@refs/heads@origin@\")     \
                 <(git -C ~/\${path} ls-remote -h upstream | cut -f2 | sed \"s@refs/heads@upstream@\") \
-          | grep -Pv \"(refs/heads/pull-request/|master|main)\" | tr '[:space:]' ' '                  \
+          | grep -Pv \"(/pull-request/|master|main)\" | tr '[:space:]' ' '                            \
         )'\"                                                                                          \
-        " % \
-      | xargs -r -d'\n' -I% echo -n local %\;
+        " %
     )";
 
     local repo_branches=;
     local common_branches=;
 
     for repo_branches in ${!repo_branches_*}; do
-        if test -z "${common_branches}"; then
+
+        if test "${#common_branches}" -eq 0; then
             # start with first repo's set of branches
             common_branches="$(\
-                echo "${!repo_branches}"     \
-              | xargs -r -n1                 \
-              | sort -V --parallel=${n_jobs} \
-              | tr '[:space:]' ' '           \
+                echo "${!repo_branches}"       \
+              | xargs -r -n1                   \
+              | sort -V --parallel="${n_jobs}" \
+              | tr '[:space:]' ' '             \
             )";
         else
             # get a sorted set of branches common to all repos up to this point
             common_branches="$(\
                 echo "${common_branches} ${!repo_branches}" \
               | xargs -r -n1                                \
-              | sort -V --parallel=${n_jobs}                \
+              | sort -V --parallel="${n_jobs}"              \
               | uniq -d                                     \
               | tr '[:space:]' ' '                          \
             )";
         fi
-    done
 
-    if test -z "${common_branches}"; then
-        echo "No branches in common for repos: ${repo_names[@]}";
-        exit 0;
-    fi;
-
-    echo "Found branches in common for: ${repo_names[@]}";
+        if test "${#common_branches}" -eq 0; then
+            echo "No branches in common for repos: ${repo_names[*]}" >&2;
+            exit 1;
+        fi
+    done
 
+    echo "Found branches in common for: ${repo_names[*]}";
     echo "Please select a branch to check out:";
 
-    local branches=($(echo "${common_branches}" | xargs -r -n1 | sort -Vr --parallel=${n_jobs}));
+    # local branches=($(echo "${common_branches}" | xargs -r -n1 | sort -Vr --parallel=${n_jobs}));
+    local -a branches=();
+    readarray -t branches < <(echo "${common_branches}" | xargs -r -n1 | sort -Vr --parallel="${n_jobs}");
     local branch_name="";
 
     select branch_name in "${branches[@]}" "Quit"; do
@@ -130,21 +125,21 @@ checkout_same_branch() {
         local remote="${branch_name/\/*}";
         local branch="${branch_name/*\/}";
 
-        git -C ~/${!repo_path} fetch ${remote} "refs/heads/${branch}";
+        git -C ~/${!repo_path} fetch "${remote}" "refs/heads/${branch}";
 
         if ! git -C ~/${!repo_path} checkout -b "${branch}" -t "${remote}/${branch}" 2>/dev/null; then
             git -C ~/${!repo_path} checkout "${branch}";
             git -C ~/${!repo_path} branch "${branch}" -u "${remote}/${branch}";
         fi
 
-        git -C ~/${!repo_path} submodule update --init --recursive -j $(nproc --ignore=2);
+        git -C ~/${!repo_path} submodule update --init --recursive -j "${n_jobs}";
     done;
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"checkout-same-branch"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"checkout-same-branch"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(checkout_same_branch "$@");
+checkout_same_branch "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index e3db97f17..e55a138c1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -1,14 +1,76 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=SC2016
+
 ALT_SCRIPT_DIR="${ALT_SCRIPT_DIR:-/usr/bin}";
 TEMPLATES="${TEMPLATES:-/opt/rapids-build-utils/bin/tmpl}";
 TMP_SCRIPT_DIR="${TMP_SCRIPT_DIR:-/tmp/rapids-build-utils}";
 
+clean_completions() {
+
+    local -;
+
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
+    set -euo pipefail;
+
+    mkdir -p "${TMP_SCRIPT_DIR}";
+    mkdir -p "${HOME}/.bash_completion.d";
+    readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
+
+    local -r completions_file="${HOME}/.bash_completion.d/rapids-build-utils-utils-completions";
+
+    if test -f "${completions_file}"; then
+        local cmd; for cmd in "${commands[@]}"; do
+            complete -r "${cmd}" 2>/dev/null || true;
+            sed -i "/complete -F _devcontainer_utils_completions ${cmd};.*/d" "${completions_file}";
+        done
+    fi
+}
+
+generate_completions() {
+
+    local -;
+
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
+    set -euo pipefail;
+
+    mkdir -p "${HOME}/.bash_completion.d";
+    readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
+
+    local -r completions_file="${HOME}/.bash_completion.d/rapids-build-utils-utils-completions";
+    local -r template="${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}";
+
+    if test -f "${template}"; then
+        if ! test -f "${completions_file}"; then
+            cp "${template}" "${completions_file}";
+        fi
+        local cmd; for cmd in "${commands[@]}"; do
+            local str="complete -F _devcontainer_utils_completions ${cmd};";
+            if ! grep -q "${str}" "${completions_file}"; then
+                echo "${str}" >> "${completions_file}";
+            fi
+        done
+    fi
+}
+
 clean_scripts() {
+    local -;
     set -euo pipefail;
-    mkdir -p "${TMP_SCRIPT_DIR}" ~/.bash_completion.d;
-    find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \; \
-  | xargs -r -I% rm -f "${TMP_SCRIPT_DIR}"/% ~/.bash_completion.d/%;
+    mkdir -p "${TMP_SCRIPT_DIR}";
+    readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
+    sudo rm -f -- \
+        "${commands[@]/#/${ALT_SCRIPT_DIR}\/}" \
+        "${commands[@]/#/${TMP_SCRIPT_DIR}\/}" ;
 }
 
 generate_script() {
@@ -42,8 +104,6 @@ generate_script() {
             if [[ "${bin}" != "${bin,,}" ]]; then
                 sudo ln -sf "${TMP_SCRIPT_DIR}/${bin,,}" "${ALT_SCRIPT_DIR}/${bin,,}";
             fi
-
-            devcontainer-utils-generate-bash-completion --command "${bin}" --out-dir ~/.bash_completion.d;
         ) & true;
 
         echo "$!"
@@ -62,8 +122,6 @@ generate_all_script_impl() {
             chmod +x "${TMP_SCRIPT_DIR}/${bin}";
 
             sudo ln -sf "${TMP_SCRIPT_DIR}/${bin}" "${ALT_SCRIPT_DIR}/${bin}";
-
-            devcontainer-utils-generate-bash-completion --command "${bin}" --out-dir ~/.bash_completion.d;
         ) & true;
 
         echo "$!"
@@ -72,10 +130,12 @@ generate_all_script_impl() {
 
 generate_all_script() {
     if test -f "${TEMPLATES}/all.${SCRIPT}.tmpl.sh"; then (
+        # shellcheck disable=SC2002
         cat "${TEMPLATES}/all.${SCRIPT}.tmpl.sh" \
       | generate_all_script_impl       ;
     ) || true;
     elif test -f "${TEMPLATES}/all.tmpl.sh"; then (
+        # shellcheck disable=SC2002
         cat "${TEMPLATES}/all.tmpl.sh" \
       | generate_all_script_impl       ;
     ) || true;
@@ -84,6 +144,7 @@ generate_all_script() {
 
 generate_clone_script() {
     if test -f "${TEMPLATES}/repo.clone.tmpl.sh"; then (
+        # shellcheck disable=SC2002
         cat "${TEMPLATES}/repo.clone.tmpl.sh" \
       | generate_script "clone-${NAME}"  ;
     ) || true;
@@ -92,8 +153,9 @@ generate_clone_script() {
 
 generate_repo_scripts() {
     local script_name;
-    for script_name in "configure" "build" "clean" "install" "uninstall"; do
+    for script_name in "configure" "build" "cpack" "clean" "install" "uninstall"; do
         if test -f "${TEMPLATES}/repo.${script_name}.tmpl.sh"; then (
+            # shellcheck disable=SC2002
             cat "${TEMPLATES}/repo.${script_name}.tmpl.sh" \
           | generate_script "${script_name}-${NAME}"  ;
         ) || true;
@@ -105,9 +167,10 @@ generate_cpp_scripts() {
     local script_name;
     for script_name in "clean" "configure" "build" "cpack" "install" "uninstall"; do
         if test -f "${TEMPLATES}/cpp.${script_name}.tmpl.sh"; then (
+            # shellcheck disable=SC2002
             cat "${TEMPLATES}/cpp.${script_name}.tmpl.sh"  \
           | CPP_SRC="${SRC_PATH:-}${CPP_SRC:+/$CPP_SRC}"   \
-            generate_script "${script_name}-${CPP_LIB}-cpp";
+            generate_script "${script_name}-${CPP_LIB-}-cpp";
         ) || true;
         fi
     done
@@ -117,6 +180,7 @@ generate_python_scripts() {
     local script_name;
     for script_name in "build" "clean" "uninstall"; do
         if test -f "${TEMPLATES}/python.${script_name}.tmpl.sh"; then (
+            # shellcheck disable=SC2002
             cat "${TEMPLATES}/python.${script_name}.tmpl.sh" \
           | generate_script "${script_name}-${PY_LIB}-python";
         ) || true;
@@ -124,6 +188,7 @@ generate_python_scripts() {
     done
     for script_name in "editable" "wheel"; do
         if test -f "${TEMPLATES}/python.build.${script_name}.tmpl.sh"; then (
+            # shellcheck disable=SC2002
             cat "${TEMPLATES}/python.build.${script_name}.tmpl.sh" \
           | generate_script "build-${PY_LIB}-python-${script_name}";
         ) || true;
@@ -133,6 +198,14 @@ generate_python_scripts() {
 
 generate_scripts() {
 
+    local -;
+
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     # Generate and install the "clone-<repo>" scripts
 
     set -euo pipefail;
@@ -140,12 +213,9 @@ generate_scripts() {
     # Ensure we're in this script's directory
     cd "$( cd "$( dirname "$(realpath -m "${BASH_SOURCE[0]}")" )" && pwd )";
 
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "$@")";
 
-    declare -A cpp_name_to_path;
+    local -A cpp_name_to_path;
 
     local i;
     local j;
@@ -185,7 +255,7 @@ generate_scripts() {
             cpp_dirs+=("${cpp_path}");
             cpp_libs+=("${!cpp_name:-}");
             cpp_name="${!cpp_name:-}";
-            cpp_name_lower="${cpp_name,,}";
+            # cpp_name_lower="${cpp_name,,}";
 
             cpp_name_to_path["${cpp_name}"]="${cpp_path}";
 
@@ -199,20 +269,20 @@ generate_scripts() {
                 fi
                 local dep_cpp_path="${cpp_name_to_path["${dep_cpp_name}"]}";
 
-                deps+=(-D${!dep}_ROOT=\"${dep_cpp_path}/build/latest\");
-                deps+=(-D${!dep,,}_ROOT=\"${dep_cpp_path}/build/latest\");
-                deps+=(-D${!dep^^}_ROOT=\"${dep_cpp_path}/build/latest\");
+                deps+=("-D${!dep}_ROOT=\"${dep_cpp_path}/build/latest\"");
+                deps+=("-D${!dep,,}_ROOT=\"${dep_cpp_path}/build/latest\"");
+                deps+=("-D${!dep^^}_ROOT=\"${dep_cpp_path}/build/latest\"");
             done
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-            (
+            # (
                 SRC_PATH=~/"${!repo_path:-}" \
                 CPP_LIB="${cpp_name:-}"      \
                 CPP_SRC="${!cpp_sub_dir:-}"  \
                 CPP_ARGS="${!cpp_args:-}"    \
-                CPP_DEPS="${deps[@]}"        \
+                CPP_DEPS="${deps[*]}"        \
                 generate_cpp_scripts         ;
-            ) || true;
+            # ) || true;
             fi
         done
 
@@ -225,12 +295,12 @@ generate_scripts() {
             # scikit-build CMakeLists.txt's aren't 100% consistent in the casing
             local cpp_dir="${cpp_dirs[$k]}";
             local cpp_lib="${cpp_libs[$k]}";
-            args+=(-DFIND_${cpp_lib}_CPP=ON);
-            args+=(-DFIND_${cpp_lib,,}_CPP=ON);
-            args+=(-DFIND_${cpp_lib^^}_CPP=ON);
-            deps+=(-D${cpp_lib}_ROOT=\"${cpp_dir}/build/latest\");
-            deps+=(-D${cpp_lib,,}_ROOT=\"${cpp_dir}/build/latest\");
-            deps+=(-D${cpp_lib^^}_ROOT=\"${cpp_dir}/build/latest\");
+            args+=("-DFIND_${cpp_lib}_CPP=ON");
+            args+=("-DFIND_${cpp_lib,,}_CPP=ON");
+            args+=("-DFIND_${cpp_lib^^}_CPP=ON");
+            deps+=("-D${cpp_lib}_ROOT=\"${cpp_dir}/build/latest\"");
+            deps+=("-D${cpp_lib,,}_ROOT=\"${cpp_dir}/build/latest\"");
+            deps+=("-D${cpp_lib^^}_ROOT=\"${cpp_dir}/build/latest\"");
         done
 
         for ((j=0; j < ${!py_length:-0}; j+=1)); do
@@ -240,51 +310,51 @@ generate_scripts() {
             local pip_wheel_args="${repo}_python_${j}_args_wheel";
             local pip_install_args="${repo}_python_${j}_args_install";
             local py_sub_dir="${repo}_python_${j}_sub_dir";
-            local py_depends_length="${repo}_python_${j}_depends_length";
+            # local py_depends_length="${repo}_python_${j}_depends_length";
             local py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
 
             py_dirs+=("${py_path}");
             py_libs+=("${!py_name}");
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-            (
+            # (
                 SRC_PATH=~/"${!repo_path:-}"              \
                 PY_SRC="${py_path}"                       \
                 PY_LIB="${!py_name}"                      \
                 PY_ENV="${!py_env:-}"                     \
-                CPP_ARGS="${args[@]}"                     \
-                CPP_DEPS="${deps[@]}"                     \
+                CPP_ARGS="${args[*]}"                     \
+                CPP_DEPS="${deps[*]}"                     \
                 PY_CMAKE_ARGS="${!py_cmake_args:-}"       \
                 PIP_WHEEL_ARGS="${!pip_wheel_args:-}"     \
                 PIP_INSTALL_ARGS="${!pip_install_args:-}" \
                 generate_python_scripts                   ;
-            ) || true;
+            # ) || true;
             fi
         done;
 
         if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-        (
+        # (
             NAME="${repo_name:-}"    \
-            PY_LIB="${py_libs[@]}"   \
-            CPP_LIB="${cpp_libs[@]}" \
+            PY_LIB="${py_libs[*]}"   \
+            CPP_LIB="${cpp_libs[*]}" \
             generate_repo_scripts    ;
-        ) || true;
+        # ) || true;
         fi
 
         # Generate a clone script for each repo
-        (
+        # (
             NAME="${repo_name:-}"             \
             SRC_PATH=~/"${!repo_path:-}"      \
-            PY_LIB="${py_libs[@]}"            \
-            PY_SRC="${py_dirs[@]}"            \
-            CPP_LIB="${cpp_libs[@]}"          \
-            CPP_SRC="${cpp_dirs[@]}"          \
+            PY_LIB="${py_libs[*]}"            \
+            PY_SRC="${py_dirs[*]}"            \
+            CPP_LIB="${cpp_libs[*]}"          \
+            CPP_SRC="${cpp_dirs[*]}"          \
             GIT_TAG="${!git_tag:-}"           \
             GIT_REPO="${!git_repo:-}"         \
             GIT_HOST="${!git_host:-}"         \
             GIT_UPSTREAM="${!git_upstream:-}" \
             generate_clone_script             ;
-        ) || true;
+        # ) || true;
     done
 
     sudo find /opt/rapids-build-utils \
@@ -295,26 +365,24 @@ generate_scripts() {
 
     for script in "clone" "clean" "configure" "build" "cpack" "install" "uninstall"; do
         # Generate a script to run a script for all repos
-        (
-            NAMES="${repo_names[@]}" \
+        # (
+            NAMES="${repo_names[*]}" \
             SCRIPT="${script}"       \
             generate_all_script      ;
-        ) || true;
+        # ) || true;
     done;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"generate-scripts"*}" ); then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
-clean_scripts;
+if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = rapids-generate-scripts ]; then
 
-rm -rf "${TMP_SCRIPT_DIR}"/*;
+    clean_completions;
+    clean_scripts;
 
-for pid in $(generate_scripts "$@"); do
-    while [[ -e "/proc/$pid" ]]; do
-        sleep 0.1
+    for pid in $(generate_scripts "$@"); do
+        while [[ -e "/proc/$pid" ]]; do
+            sleep 0.1
+        done
     done
-done
+
+    generate_completions;
+fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 2e0d66ef6..7850e3f66 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -23,29 +23,23 @@
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 get_num_archs_jobs_and_load() {
     set -Eeuo pipefail
 
-    parse_args_or_show_help - <<< "$@";
-
-    local archs="${a:-${archs:-1}}";
-    archs="${archs//"true"/}";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    local parallel="${j:-${parallel:-${JOBS:-${PARALLEL_LEVEL:-1}}}}";
-    parallel="${parallel//"true"/}";
-    parallel="${parallel:-$(nproc)}";
+    if test ${#j[@]} -gt 0 && test -z "${j:-}"; then
+        j=$(nproc);
+    fi
 
-    local max_device_obj_memory_usage="${m:-${max_device_obj_memory_usage:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-}}}";
-    max_device_obj_memory_usage="${max_device_obj_memory_usage//"true"/}";
-    max_device_obj_memory_usage="${max_device_obj_memory_usage:-1}";
+    parallel="${j:-${JOBS:-${PARALLEL_LEVEL:-1}}}";
+    max_device_obj_memory_usage="${m:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-1}}";
 
     local n_arch=${archs:-1};
 
     if test -z "${archs:-}" \
     && test -n "${INFER_NUM_DEVICE_ARCHITECTURES:-}"; then
-        archs=$(rapids-parse-cmake-var-from-args CMAKE_CUDA_ARCHITECTURES "${__rest__[@]}");
+        archs=$(rapids-parse-cmake-var-from-args CMAKE_CUDA_ARCHITECTURES "${OPTS[@]}");
         archs="${archs:-${CMAKE_CUDA_ARCHITECTURES:-${CUDAARCHS:-}}}";
 
         case "${archs:-}" in
@@ -74,10 +68,11 @@ get_num_archs_jobs_and_load() {
     # Clamp between 1 and 3 threads per nvcc job
     n_arch=$(( n_arch < 1 ? 1 : n_arch > 3 ? 3 : n_arch ));
 
-    local free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
-    local freeswap=$(free --giga | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
+    local -r free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
+    local -r freeswap=$(free --giga | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
     local all_cpus="${parallel}";
     local n_load="${all_cpus}";
+    # shellcheck disable=SC2155
     local n_jobs="$(cat<<____EOF | bc
 scale=0
 max_cpu=(${all_cpus} / ${n_arch} / 2 * 3)
@@ -88,15 +83,15 @@ ____EOF
     n_jobs=$((n_jobs < 1 ? 1 : n_jobs));
     n_jobs=$((n_arch > 1 ? n_jobs : n_load));
 
-    echo "n_arch=${n_arch}";
-    echo "n_jobs=${n_jobs}";
-    echo "n_load=${n_load}";
+    echo "declare n_arch; n_arch=${n_arch}";
+    echo "declare n_jobs; n_jobs=${n_jobs}";
+    echo "declare n_load; n_load=${n_load}";
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"get-num-archs-jobs-and-load"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"get-num-archs-jobs-and-load"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(get_num_archs_jobs_and_load "$@");
+get_num_archs_jobs_and_load "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 3c04ffb1c..1d657d4ce 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -16,53 +16,43 @@
 #  -r,--repo <repo>      Filter the results to include <repo> entries.
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 list_repos() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
-
-    local repos=();
-    repos+=(${r[@]:-}); unset r;
-    repos+=(${repo[@]:-}); unset repo;
-    repos=(${repos[@]:-});
-
-    local omits=();
-    omits+=(${o[@]:-}); unset o;
-    omits+=(${omit[@]:-}); unset omit;
-    omits=(${omits[@]:-});
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -m,--manifest
+    ' - <<< "${@@Q}")";
 
     local query=".repos | {repos: .}";
     local filters=();
 
-    if test ${#repos[@]} -gt 0; then
+    if test ${#repo[@]} -gt 0; then
         # prefix each element
-        repos=("${repos[@]/#/'.name == "'}");
+        repo=("${repo[@]/#/'.name == "'}");
         # suffix each element
-        repos=("${repos[@]/%/'" or'}");
-        filters+=("| map(select(${repos[@]} false))");
+        repo=("${repo[@]/%/'" or'}");
+        filters+=("| map(select(${repo[@]} false))");
     fi
 
-    if test ${#omits[@]} -gt 0; then
+    if test ${#omit[@]} -gt 0; then
         # prefix each element
-        omits=("${omits[@]/#/'.name != "'}");
+        omit=("${omit[@]/#/'.name != "'}");
         # suffix each element
-        omits=("${omits[@]/%/'" and'}");
-        filters+=("| map(select(${omits[@]} true))");
+        omit=("${omit[@]/%/'" and'}");
+        filters+=("| map(select(${omit[@]} true))");
     fi
 
     if test -n "${filters:-}"; then
-        query=".repos ${filters[@]} | {repos: .}";
+        query=".repos ${filters[*]} | {repos: .}";
     fi
 
-    rapids-query-manifest "$@" "${query}";
+    rapids-query-manifest "${OPTS[@]}" -- "${query}";
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"list-repos"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+    || test -z "${rapids_build_utils_debug##*"list-repos"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(list_repos "$@");
+list_repos "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index a1ef52bf9..3aecf7463 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -17,11 +17,9 @@
 #  --repo <repo>         Only include dependencies for repo(s).
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 generate_env_yaml() {
     (
-        (rapids-dependency-file-generator ${@:2} 2>/dev/null || echo "name: none") \
+        (rapids-dependency-file-generator "${@:2}" 2>/dev/null || echo "name: none") \
       | (grep -v '^#' || [ "$?" == "1" ]) \
       | tee "${1}" 1>/dev/null;
     ) & true
@@ -30,17 +28,14 @@ generate_env_yaml() {
 make_conda_dependencies() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
-
-    local keys=();
-    keys+=(${k[@]:-}); unset k;
-    keys+=(${key[@]:-}); unset key;
-    keys=(${keys[@]:-all});
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -m,--manifest
+        -o,--omit
+        --repo
+    ' - <<< "${@@Q}")";
 
-    local repos=();
-    repos+=(${r[@]:-}); unset r;
-    repos+=(${repo[@]:-}); unset repo;
-    repos=(${repos[@]:-});
+    # shellcheck disable=SC2206
+    key=(${key[@]:-all});
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
@@ -50,10 +45,7 @@ make_conda_dependencies() {
 
     local conda_env_yamls=();
 
-    eval "$(                                  \
-        rapids-list-repos ${repos[@]/#/-r }   \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "${OPTS[@]}")";
 
     local i;
 
@@ -72,7 +64,7 @@ make_conda_dependencies() {
 
                 echo "Generating ${!py_name}'s conda env yml" 1>&2;
 
-                local repo_keys=(${keys[@]} ${keys[@]/%/_${!py_name//"-"/"_"}});
+                local repo_keys=("${key[@]}" "${key[@]/%/_${!py_name//"-"/"_"}}");
                 local keyi;
 
                 for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
@@ -80,7 +72,7 @@ make_conda_dependencies() {
                     conda_env_yamls+=("${file}");
                     generate_env_yaml                                                         \
                         "${file}"                                                             \
-                        --file_key ${repo_keys[$keyi]}                                        \
+                        --file_key "${repo_keys[$keyi]}"                                      \
                         --output conda                                                        \
                         --config ~/"${!repo_path}/dependencies.yaml"                          \
                         --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
@@ -98,6 +90,7 @@ make_conda_dependencies() {
             done
         done
 
+        # shellcheck disable=SC2207
         local conda_noinstall=($(rapids-python-pkg-names) $(rapids-python-conda-pkg-names));
         # Generate a combined conda env yaml file.
         conda-merge "${conda_env_yamls[@]}"                                                              \
@@ -111,9 +104,9 @@ make_conda_dependencies() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-conda-dependencies"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-conda-dependencies"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(make_conda_dependencies "$@");
+make_conda_dependencies "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 16ec109ae..068159af3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -18,26 +18,29 @@
 #  --repo <repo>         Only include dependencies for repo(s).
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 make_conda_env() {
     set -Eeuo pipefail;
 
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.yml";
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -k,--key
+        -m,--manifest
+        -o,--omit
+        --repo
+    ' - <<< "${@@Q}")";
 
     # Remove the current conda env if called with `-f|--force`
     if test -n "${f:-${force:-}}"; then
-        rm -rf "$HOME/.conda/envs/${env_name}" \
-               "$HOME/.conda/envs/${env_file_name}";
+        rm -rf "${HOME}/.conda/envs/${env_name}" \
+               "${HOME}/.conda/envs/${env_file_name}";
     fi
 
-    local new_env_path="$(realpath -m /tmp/${env_file_name})";
-    local old_env_path="$(realpath -m ~/.conda/envs/${env_file_name})";
+    local -r new_env_path="$(realpath -m "/tmp/${env_file_name}")";
+    local -r old_env_path="$(realpath -m "${HOME}/.conda/envs/${env_file_name}")";
 
-    rapids-make-conda-dependencies "$@" > "${new_env_path}";
+    rapids-make-conda-dependencies "${OPTS[@]}" > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 
@@ -72,14 +75,17 @@ make_conda_env() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-conda-env"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-conda-env"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
+# shellcheck disable=SC1091
 . /opt/conda/etc/profile.d/conda.sh;
+# shellcheck disable=SC1091
 . /opt/conda/etc/profile.d/mamba.sh;
 
 make_conda_env "${DEFAULT_CONDA_ENV:-rapids}" "$@";
 
+# shellcheck disable=SC1090
 . /etc/profile.d/*-mambaforge.sh;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index bbd367987..190100d09 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -7,6 +7,7 @@
 #
 # Boolean options:
 #  -h,--help,--usage       print this text
+#  --no-dedupe             don't sort and dedupe the combined requirements.txt
 #
 # Options that require values:
 #  -k,--key <key>          Only include the key(s)
@@ -18,11 +19,9 @@
 #                          (default: all repositories)
 #  -r,--requirement <file> Path(s) to additional requirement files to include.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 generate_requirements() {
     (
-        (rapids-dependency-file-generator ${@:2} 2>/dev/null || echo "") \
+        (rapids-dependency-file-generator "${@:2}" 2>/dev/null || echo "") \
       | (grep -v '^#' || [ "$?" == "1" ]) \
       | tee "${1}" 1>/dev/null;
     ) & true
@@ -31,34 +30,25 @@ generate_requirements() {
 make_pip_dependencies() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
-
-    local keys=();
-    keys+=(${k[@]:-}); unset k;
-    keys+=(${key[@]:-}); unset key;
-    keys=(${keys[@]:-py_build py_run py_test all});
-
-    local repos=();
-    repos+=(${repo[@]:-}); unset repo;
-    repos=(${repos[@]:-});
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -m,--manifest
+        -o,--omit
+        --repo
+    ' - <<< "${@@Q}")";
 
-    local requirements=();
-    requirements+=(${r[@]:-}); unset r;
-    requirements+=(${requirement[@]:-}); unset requirement;
+    # shellcheck disable=SC2206
+    key=(${key[@]:-py_build py_run py_test all});
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]*' <<< "${cuda_version}")";
-    local cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
+    local -r cuda_version_major="$(cut -d'.' -f1 <<< "${cuda_version}")";
 
     local python_version="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     python_version="$(cut -d'.' -f3 --complement <<< "${python_version}")";
 
     local pip_reqs_txts=();
 
-    eval "$(                                  \
-        rapids-list-repos ${repos[@]/#/-r }   \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "${OPTS[@]}")";
 
     local i;
 
@@ -77,7 +67,7 @@ make_pip_dependencies() {
 
                 echo "Generating ${!py_name}'s requirements.txt" 1>&2;
 
-                local repo_keys=(${keys[@]} ${keys[@]/%/_${!py_name//"-"/"_"}});
+                local repo_keys=("${key[@]}" "${key[@]/%/_${!py_name//"-"/"_"}}");
                 local keyi;
 
                 for ((keyi=0; keyi < ${#repo_keys[@]}; keyi+=1)); do
@@ -85,7 +75,7 @@ make_pip_dependencies() {
                     pip_reqs_txts+=("${file}");
                     generate_requirements                                                     \
                         "${file}"                                                             \
-                        --file_key ${repo_keys[$keyi]}                                        \
+                        --file_key "${repo_keys[$keyi]}"                                      \
                         --output requirements                                                 \
                         --config ~/"${!repo_path}/dependencies.yaml"                          \
                         --matrix "arch=$(uname -m);cuda=${cuda_version};py=${python_version}" \
@@ -117,11 +107,14 @@ make_pip_dependencies() {
         done
 
         # Generate a combined requirements.txt file
-        cat "${requirements[@]}" "${pip_reqs_txts[@]}"                                                              \
-          | (grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ])  \
-          | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                       \
-          | sed -E "s/cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                                           \
-          | sed -E "s/cuda-python.*/cuda-python>=${cuda_version}.0,<$((cuda_version_major+1)).0a0/g"                \
+        # shellcheck disable=SC2154
+        cat "${requirement[@]}" "${pip_reqs_txts[@]}"                                                           \
+      | (grep -v -E '^$' || [ "$?" == "1" ])                                                                    \
+      | ( if test -n "${no_dedupe:-}"; then cat -; else tr -s "[:blank:]" | LC_ALL=C sort -u; fi )              \
+      | (grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ])  \
+      | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                       \
+      | sed -E "s/cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                                           \
+      | sed -E "s/cuda-python.*/cuda-python>=${cuda_version}.0,<$((cuda_version_major+1)).0a0/g"                \
         ;
 
         rm -f "${pip_reqs_txts[@]}";
@@ -129,8 +122,8 @@ make_pip_dependencies() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-pip-dependencies"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+    || test -z "${rapids_build_utils_debug##*"make-pip-dependencies"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 2f92e2706..d80f2a798 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -8,6 +8,7 @@
 # Boolean options:
 #  -h,--help,--usage       print this text
 #  -f,--force              Delete the existing pip venv and recreate it from scratch.
+#  --no-dedupe             don't sort and dedupe the combined requirements.txt
 #
 # Options that require values:
 #  -k,--key <key>          Only include the key(s)
@@ -19,42 +20,44 @@
 #                          (default: all repositories)
 #  -r,--requirement <file> Path(s) to additional requirement files to include.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 make_pip_env() {
     set -Eeuo pipefail;
 
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.requirements.txt";
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        --no-dedupe
+        -k,--key
+        -m,--manifest
+        -o,--omit
+        --repo
+        -r,--requirement
+    ' - <<< "${@@Q}")";
 
     # Remove the current virtual env if called with `-f|--force`
     if test -n "${f:-${force:-}}"; then
-        rm -rf "$HOME/.local/share/venvs/${env_name}" \
-               "$HOME/.local/share/venvs/${env_file_name}";
+        rm -rf "${HOME}/.local/share/venvs/${env_name}" \
+               "${HOME}/.local/share/venvs/${env_file_name}";
     fi
 
-    local new_env_path="$(realpath -m /tmp/${env_file_name})";
-    local old_env_path="$(realpath -m ~/.local/share/venvs/${env_file_name})";
+    local -r new_env_path="$(realpath -m "/tmp/${env_file_name}")";
+    local -r old_env_path="$(realpath -m "${HOME}/.local/share/venvs/${env_file_name}")";
 
-    rapids-make-pip-dependencies "$@"     \
-  | (grep -v -E '^$' || [ "$?" == "1" ])  \
-  | tr -s "[:blank:]"                     \
-  | LC_ALL=C sort -u                      \
-  > "${new_env_path}"
+    rapids-make-pip-dependencies "${OPTS[@]}" > "${new_env_path}";
 
     if test -f "${new_env_path}"; then
 
         # If the venv doesn't exist, make one
-        if [ ! -d ~/.local/share/venvs/${env_name} ]; then
+        if [ ! -d "${HOME}/.local/share/venvs/${env_name}" ]; then
             echo -e "Creating '${env_name}' virtual environment\n" 1>&2;
             echo -e "Requirements (${env_file_name}):\n" 1>&2;
             cat "${new_env_path}";
             echo "";
 
-            python -m venv --system-site-packages ~/.local/share/venvs/${env_name};
-            . ~/.local/share/venvs/${env_name}/bin/activate;
+            python -m venv --system-site-packages "${HOME}/.local/share/venvs/${env_name}";
+            # shellcheck disable=SC1090
+            . "${HOME}/.local/share/venvs/${env_name}/bin/activate";
             python -m pip install -U pip;
             python -m pip install --pre -I -r "${new_env_path}";
         # If the venv does exist but it's different from the generated one,
@@ -71,7 +74,8 @@ make_pip_env() {
              && echo "";
 
             # Update the current venv
-            . ~/.local/share/venvs/${env_name}/bin/activate;
+            # shellcheck disable=SC1090
+            . "${HOME}/.local/share/venvs/${env_name}/bin/activate";
             python -m pip install -U pip;
             python -m pip install --pre -U -r "${new_env_path}";
         fi
@@ -81,13 +85,14 @@ make_pip_env() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-pip-env"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+    || test -z "${rapids_build_utils_debug##*"make-pip-env"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
 make_pip_env "${DEFAULT_VIRTUAL_ENV:-rapids}" "$@";
 
-if test -f ~/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate; then
-    . ~/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate;
+if test -f "${HOME}/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate"; then
+    # shellcheck disable=SC1090
+    . "${HOME}/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate";
 fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
index 232b7c622..4c22fde6e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
@@ -12,7 +12,7 @@ get_repos() {
     local repos="$(get_repos_ordered)";
 
     join \
-      <(echo "${repos}" | sort -k 1b,1)                                          \
+      <(echo "${repos}" | sort -k 1b,1)                           \
       <(find ~ -maxdepth 1 -mindepth 1 -type d ! -name '.*' -exec \
         bash -c "echo '${repos}' | grep \$(basename {})" \; \
       | sort -k 1b,1 | uniq) \
@@ -35,10 +35,7 @@ EOF
 }
 
 cpp_lib_dirs() {
-    eval "$(                                  \
-        rapids-list-repos --repo "${1}"       \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos --repo "${1}")";
 
     local i=0;
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
@@ -94,8 +91,8 @@ EOF
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-vscode-workspace"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"make-vscode-workspace"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
@@ -106,5 +103,5 @@ if echo "$@" | grep -qE '(\-u|\-\-update)'; then
     fi
     rm /tmp/workspace.code-workspace;
 else
-    (make_vscode_workspace "$@");
+    make_vscode_workspace "$@";
 fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
index d3d908d11..7540df8dd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
@@ -23,7 +23,7 @@ parse_cmake_args() {
         args+=("$(printf %q "${ARG}")");
     done;
 
-    echo ${args[@]};
+    echo "${args[@]}";
 }
 
-(parse_cmake_args "$@");
+parse_cmake_args "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
index 3c748f946..2963123d0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-(rapids-parse-cmake-var-from-args CMAKE_BUILD_TYPE "$@");
+rapids-parse-cmake-var-from-args CMAKE_BUILD_TYPE "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
index 6433c99d8..7864af748 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
@@ -11,4 +11,4 @@ parse_cmake_var_from_args() {
     envsubst "\$$1" <<< "\$$1";
 }
 
-(parse_cmake_var_from_args "$@");
+parse_cmake_var_from_args "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
index d78663ad7..fa2cd34ae 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
@@ -14,10 +14,10 @@ parse_cmake_vars_from_args() {
 
     local args="";
     args="$(rapids-parse-cmake-args "$@")";
-    args="$(join_with_delimiter "\n" $args)";
+    args="$(join_with_delimiter "\n" "${args}")";
     echo -e "$args" \
   | grep '\-D' \
   | sed -r 's/^-D//';
 }
 
-(parse_cmake_vars_from_args "$@");
+parse_cmake_vars_from_args "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
index 0a38d9781..fbbc2224a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
@@ -4,19 +4,19 @@ parse_valid_args() {
 
     set -euo pipefail;
 
-    local cmd="$@";
-    local hash="$(echo "$cmd" | tr -d'[:space:]')";
-    local file=${TMPDIR:-/tmp}/${hash}-args.log;
+    local -r cmd="$*";
+    local -r hash="$(echo "$cmd" | tr -d'[:space:]')";
+    local -r file="${TMPDIR:-/tmp}/${hash}-args.log";
 
-    if [[ ! -f ${file} ]]; then
+    if [[ ! -f "${file}" ]]; then
         $cmd --help                             \
       | grep -oE '^  -(-|\w+|\d+|, --|, |,|=)+' \
       | tr -d '  ' | tr ',' '\n'                \
       | sed -r '/^\s*$/d'                       \
-      > ${file};
+      > "${file}";
     fi
 
-    cat ${file};
+    cat "${file}";
 }
 
-(parse_valid_args "$@");
+parse_valid_args "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
index d4366187e..b1d9cf539 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
@@ -2,6 +2,6 @@
 
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_ATTACH_COMMAND:-}"; then
     if test -n "${PYTHON_PACKAGE_MANAGER:-}"; then
-        rapids-make-${PYTHON_PACKAGE_MANAGER}-env || true;
+        rapids-make-"${PYTHON_PACKAGE_MANAGER}"-env || true;
     fi
 fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 5f5be46a1..9c2498a72 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -16,17 +16,12 @@
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 pull_repositories() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "$@")";
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
@@ -42,13 +37,13 @@ pull_repositories() {
         git -C ~/${!repo_path} fetch --no-tags upstream;
         git -C ~/${!repo_path} fetch --no-tags origin;
 
-        local branch_name=$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD);
+        local -r branch_name="$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD)";
 
-        while [[ -z "$(git -C ~/${!repo_path} branch -r | grep upstream/$branch_name)" ]]; do
+        while ! git -C ~/${!repo_path} branch -r | grep -q "upstream/${branch_name}"; do
 
-            local upstream_info="$(git -C ~/${!repo_path} remote -v show | grep upstream | head -n1)";
+            local -r upstream_info="$(git -C ~/${!repo_path} remote -v show | grep upstream | head -n1)";
 
-            read -p "
+            read -rp "
 ############################################################
 Branch \"$branch_name\" not found in:
 ${upstream_info}
@@ -57,20 +52,20 @@ ${upstream_info}
 Please enter a branch name to pull (or leave empty to skip): " branch_name </dev/tty
         done;
 
-        if [[ -n "$branch_name" ]]; then
-            git -C ~/${!repo_path} pull --no-tags upstream "$branch_name";
+        if [[ -n "${branch_name}" ]]; then
+            git -C ~/${!repo_path} pull --no-tags upstream "${branch_name}";
             git -C ~/${!repo_path} submodule update --init --recursive;
         else
             echo "No alternate branch name supplied, skipping";
         fi;
 
-    done;
+    done
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"pull-repositories"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"pull-repositories"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(pull_repositories "$@");
+pull_repositories "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index 739dcdf11..6f5c15f33 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -16,17 +16,12 @@
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 push_repositories() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "$@")";
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
@@ -40,14 +35,14 @@ push_repositories() {
 
         echo "Pushing ${!repo_name}...";
 
-        git -C ~/${!repo_path} push origin $(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD);
+        git -C ~/${!repo_path} push origin "$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD)";
     done;
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"push-repositories"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"push-repositories"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(push_repositories "$@");
+push_repositories "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index 9bdcdad5b..8f0bf7065 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -19,17 +19,12 @@
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 python_conda_pkg_names() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "$@")";
 
     local i;
 
@@ -55,9 +50,9 @@ python_conda_pkg_names() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"python-conda-pkg-names"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"python-conda-pkg-names"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(python_conda_pkg_names "$@");
+python_conda_pkg_names "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index 567cc3660..c2294d303 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -16,17 +16,12 @@
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 python_pkg_names() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "$@")";
 
     local i;
     local j;
@@ -46,4 +41,4 @@ python_pkg_names() {
     done
 }
 
-(python_pkg_names "$@");
+python_pkg_names "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index 524aabf47..ff7583ae8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -16,17 +16,12 @@
 #  -r,--repo <repo>      Filter the results to only include <repo> entries.
 #                        (default: all repositories)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 python_pkg_roots() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    eval "$(                                  \
-        rapids-list-repos "$@"                \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(rapids-list-repos "$@")";
 
     local i;
     local j;
@@ -46,4 +41,4 @@ python_pkg_roots() {
     done
 }
 
-(python_pkg_roots "$@");
+python_pkg_roots "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index e2bb56172..0af7c6068 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -12,12 +12,10 @@
 #  -m,--manifest <file>  Use a specific manifest.json
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
 
-. devcontainer-utils-parse-args-from-docstring;
-
 query_manifest() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "${@@Q}";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     local manifest="${m:-${manifest:-"${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}"}}";
 
@@ -36,12 +34,12 @@ query_manifest() {
           }
         ]
         | map(select(.key))
-        | map(.key + "=" + (.val | @sh | gsub("[\\n]"; " ")))[]
+        | map("declare " + .key + "; " + .key + "=" + (.val | @sh | gsub("[\\n]"; " ")))[]
 ________EOF
 )";
 
     query="$(cat <<________EOF | tr -s '[:space:]'
-        ${__rest__[-1]}
+        ${REST[@]}
         | ${query}
 ________EOF
 )";
@@ -50,9 +48,9 @@ ________EOF
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"query-manifest"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+    || test -z "${rapids_build_utils_debug##*"query-manifest"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(query_manifest "$@");
+query_manifest "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
index 1ba8f71b5..1dd2d1976 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -21,16 +21,14 @@
 #                                         limit.
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
-#  -t,--type editable|wheel               The type of Python build to run (editable or wheel)
+#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
 #                                         (default: editable)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 build_all() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
         if type build-${name} >/dev/null 2>&1; then
@@ -40,8 +38,8 @@ build_all() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-all"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-all"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index 92ee73ab5..946696868 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -13,30 +13,25 @@
 # Options that require values:
 #  -j,--parallel <num>          Clone <num> repos in parallel
 
-. devcontainer-utils-parse-args-from-docstring;
-
 clean_all() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    eval "$(                                    \
-        rapids-get-num-archs-jobs-and-load "$@" \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
-    )";
+    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
 
-    echo "${NAMES}" \
-  | tr '[:space:]' '\0' \
+    echo "${NAMES}"                     \
+  | tr '[:space:]' '\0'                 \
   | xargs -r -0 -P${n_jobs} -I% bash -c "
     if type clean-% >/dev/null 2>&1; then
-        clean-% '$@';
+        clean-% $* || exit 255;
     fi
     ";
 }
 
-if test -n "${rapids_clean_utils_debug:-}" \
-&& ( test -z "${rapids_clean_utils_debug##*"all"*}" \
-  || test -z "${rapids_clean_utils_debug##*"clean-all"*}" ); then
+if test -n "${rapids_build_utils_debug:-}" \
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-all"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 80cec889c..321cd0bc5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -16,44 +16,41 @@
 #
 # Options that require values:
 #  -j,--parallel <num>          Clone <num> repos in parallel
-
-. devcontainer-utils-parse-args-from-docstring;
+#                               (default: 1)
 
 clone_all() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        --no-fork
+        --clone-upstream
+    ' - <<< "${@@Q}")";
 
-    eval "$(                                    \
-        rapids-get-num-archs-jobs-and-load "$@" \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
-    )";
+    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
 
-    local all_cpus=$(nproc);
-    local n_repos=$(wc -w <<< "${NAMES}");
+    local -r n_repos=$(wc -w <<< "${NAMES}");
     n_jobs=$((n_repos < n_jobs ? n_repos : n_jobs));
 
-    local n_modules=$((all_cpus / n_jobs));
+    local n_modules=$((n_jobs / n_repos));
     n_modules=$((n_modules < 1 ? 1 : n_modules));
 
-    local clone_args=();
-    clone_args+=(-j ${n_modules});
-    clone_args+=(${no_fork:+"--no-fork"});
-    clone_args+=(${no_update_env:+"--no-update-env"});
-    clone_args+=(${clone_upstream:+"--clone-upstream"});
-
     echo "${NAMES}"                     \
   | tr '[:space:]' '\0'                 \
   | xargs -r -0 -P${n_jobs} -I% bash -c "
     if type clone-% >/dev/null 2>&1; then
-        clone-% ${clone_args[*]};
+        clone-% -j ${n_modules} --no-update-env ${OPTS[*]} || exit 255;
     fi
     ";
+
+    if test -z "${no_update_env-}"; then
+        rapids-update-content-command;
+        rapids-post-attach-command;
+    fi
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clone-all"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"clone-all"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
index 412e185d2..56dc8b4b7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
@@ -23,12 +23,10 @@
 #                                         (default: 1)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 configure_all() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
         if type configure-${name} >/dev/null 2>&1; then
@@ -38,8 +36,8 @@ configure_all() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-all"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-all"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
new file mode 100755
index 000000000..4f72ece89
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  cpack-all [OPTION]...
+#
+# Runs cpack-<repo> for each repo in "${NAMES}".
+#
+# Forwards all arguments to each underlying script.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#
+# Options that require values:
+#  -j,--parallel <num>          Clone <num> repos in parallel
+#  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
+#                               (default: none)
+
+cpack_all() {
+    set -Eeuo pipefail;
+
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+
+    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
+
+    echo "${NAMES}"                     \
+  | tr '[:space:]' '\0'                 \
+  | xargs -r -0 -P${n_jobs} -I% bash -c "
+    if type cpack-% >/dev/null 2>&1; then
+        cpack-% $* || exit 255;
+    fi
+    ";
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"cpack-all"*}"; }; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+cpack_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
index c7af7f098..56b3dedac 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
@@ -21,12 +21,10 @@
 #                                               (default: all)
 #  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 install_all() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
         if type install-${name} >/dev/null 2>&1; then
@@ -36,8 +34,8 @@ install_all() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-all"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-all"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
index f5ac0d392..9feb1449f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
@@ -11,12 +11,10 @@
 #  -h,--help,--usage                      print this text
 #  -v,--verbose                           verbose output
 
-. devcontainer-utils-parse-args-from-docstring;
-
 ${SCRIPT}_all() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
         if type ${SCRIPT}-${name} >/dev/null 2>&1; then
@@ -26,8 +24,8 @@ ${SCRIPT}_all() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"${SCRIPT}-all"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"${SCRIPT}-all"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
index 252d3c085..77c5ae95a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
@@ -11,12 +11,10 @@
 #  -h,--help,--usage                      print this text
 #  -v,--verbose                           verbose output
 
-. devcontainer-utils-parse-args-from-docstring;
-
 uninstall_all() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
         if type uninstall-${name} >/dev/null 2>&1; then
@@ -26,8 +24,8 @@ uninstall_all() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index 69cae4183..fb8891c9e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -13,6 +13,7 @@
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
 #                                         (default: 1)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#                                         (default: $(nproc))
 #  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
@@ -21,32 +22,27 @@
 #                                         (default: 1)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 build_${CPP_LIB}_cpp() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
     fi
 
-    local verbose="${v:-${verbose:-}}";
-
-    configure-${CPP_LIB}-cpp ${verbose:+-v} ${__rest__[@]};
+    configure-${CPP_LIB}-cpp "$@";
 
     eval "$(                                    \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
     # Build C++ lib
     time (
         cmake                               \
         --build "${CPP_SRC}/build/latest"   \
-        ${verbose:+--verbose}               \
+        ${v:+--verbose}                     \
         -j${n_jobs}                         \
         --                                  \
         -l${n_load}                         ;
@@ -55,8 +51,9 @@ build_${CPP_LIB}_cpp() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${CPP_LIB}-cpp"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${CPP_LIB}-cpp"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index b86d39846..e77f30d5a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -6,14 +6,12 @@
 # Clean the ${CPP_LIB} build dirs.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
-
-. devcontainer-utils-parse-args-from-docstring;
+#  -h,--help,--usage  print this text
 
 clean_${CPP_LIB}_cpp() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
@@ -24,8 +22,9 @@ clean_${CPP_LIB}_cpp() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-${CPP_LIB}-cpp"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-${CPP_LIB}-cpp"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 54143f79a..7f170ff10 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -13,6 +13,7 @@
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
 #                                         (default: 1)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#                                         (default: $(nproc))
 #  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
@@ -21,26 +22,21 @@
 #                                         (default: 1)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 configure_${CPP_LIB}_cpp() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
     fi
 
-    local verbose="${v:-${verbose:-}}";
-
     eval "$(                                    \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
-    local build_type="$(rapids-parse-cmake-build-type ${__rest__[@]} | tr '[:upper:]' '[:lower:]')";
+    local build_type="$(rapids-parse-cmake-build-type "${OPTS[@]}" | tr '[:upper:]' '[:lower:]')";
     local binary_dir="${CPP_SRC}/build/${build_type}";
     local source_dir="${CPP_SRC}";
 
@@ -58,8 +54,8 @@ configure_${CPP_LIB}_cpp() {
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});
-    cmake_args+=(${verbose:+--log-level=VERBOSE});
-    cmake_args+=(${__rest__[@]});
+    cmake_args+=(${v:+--log-level=VERBOSE});
+    cmake_args+=("${OPTS[@]}");
 
     time (
         CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
@@ -78,8 +74,9 @@ configure_${CPP_LIB}_cpp() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-${CPP_LIB}-cpp"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-${CPP_LIB}-cpp"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index bdf78fb37..cd82539a2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -13,20 +13,15 @@
 #  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
 #                               (default: none)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 cpack_${CPP_LIB}_cpp() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
-
-    local verbose="${v:-${verbose:-}}";
-    local out_dir="${o:-${out_dir:-}}";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     time (
         (
             cd "${CPP_SRC}"/build/latest/;
-            cpack -G TGZ ${verbose:+-V};
+            cpack -G TGZ ${v:+-V};
         ) || true;
 
         if test -d "${out_dir}"/; then
@@ -41,8 +36,9 @@ cpack_${CPP_LIB}_cpp() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"cpack-${CPP_LIB}-cpp"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"cpack-${CPP_LIB}-cpp"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index 2824a5387..f2bdc9b26 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -19,42 +19,39 @@
 #                                               (default: all)
 #  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 install_${CPP_LIB}_cpp() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -v,--verbose
+        --strip
+        --config
+        --default-directory-permissions
+    ' - <<< "${@@Q}")";
 
-    local strip="${strip:-}";
-    local verbose="${v:-${verbose:-}}";
-    local config="${config:+--config "${config}"}";
-    local components=(${component[@]:-all}); unset component;
-    local prefix="${p:-${prefix:-${CMAKE_INSTALL_PREFIX:-/usr/local}}}";
-    local default_directory_permissions="${default_directory_permissions:+--default-directory-permissions "${default_directory_permissions}"}";
+    component=(${component[@]:-all});
+    prefix="${p:-${CMAKE_INSTALL_PREFIX:-/usr/local}}";
 
-    for ((i=0; i < ${#components[@]}; i+=1)); do
-        local component="${components[$i]}";
-        if test "all" = "${component}"; then
-            component="";
+    local comp;
+    for comp in "${components[@]}"; do
+        if test "all" = "${comp}"; then
+            comp="";
         fi
         time (
             cmake \
-                --install "${CPP_SRC}"/build/latest/     \
-                ${strip:+--strip}                        \
-                ${verbose:+--verbose}                    \
-                ${prefix:+--prefix "${prefix}"}          \
-                ${default_directory_permissions}         \
-                ${component:+--component "${component}"} \
-                ;
+                --install "${CPP_SRC}"/build/latest/                 \
+                --prefix "${p:-${CMAKE_INSTALL_PREFIX:-/usr/local}}" \
+                ${comp:+--component "${comp}"}                       \
+                "${OPTS[@]}";
             { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB}${component:+ $component} install time:";
         ) 2>&1;
     done
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 68e4e93bf..8aaa41e1f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -9,26 +9,23 @@
 #  -h,--help,--usage  print this text
 #  -v,--verbose       verbose output
 
-. devcontainer-utils-parse-args-from-docstring;
-
 uninstall_${CPP_LIB}_cpp() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
-
-    local verbose="${v:-${verbose:-}}";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if test -f "${CPP_SRC}"/build/latest/install_manifest.txt; then
         time (
-            xargs ${verbose:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}"/build/latest/install_manifest.txt tr -d "\r") rm ${verbose:+-v} --;
+            xargs ${v:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}"/build/latest/install_manifest.txt tr -d "\r") rm -f ${v:+-v} --;
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} uninstall time:";
     ) 2>&1;
     fi
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-${CPP_LIB}-cpp"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-${CPP_LIB}-cpp"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index e16c621d6..46c025eca 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -13,6 +13,7 @@
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
 #                                         (default: 1)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#                                         (default: $(nproc))
 #  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
@@ -20,23 +21,18 @@
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 build_${PY_LIB}_python_editable() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
     fi
 
-    local verbose="${v:-${verbose:-}}";
-
     eval "$(                                    \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
     local cmake_args=(${PY_CMAKE_ARGS});
@@ -44,13 +40,13 @@ build_${PY_LIB}_python_editable() {
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});
-    cmake_args+=(${verbose:+--log-level=VERBOSE});
-    cmake_args+=(${__rest__[@]});
+    cmake_args+=(${v:+--log-level=VERBOSE});
+    cmake_args+=("${OPTS[@]}");
 
     local ninja_args=();
     local pip_args=(${PIP_INSTALL_ARGS});
 
-    if test -n "${verbose}"; then
+    if test -n "${v}"; then
         ninja_args+=("-v");
         pip_args+=("-vv");
     fi
@@ -92,9 +88,10 @@ build_${PY_LIB}_python_editable() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
   || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-editable"*}" ); then
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-editable"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
index 579e23118..6f45d741a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
@@ -10,22 +10,21 @@
 #  -v,--verbose                           verbose output
 #
 # Options that require values:
-#  -t,--type editable|wheel               The type of Python build to run (editable or wheel)
+#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
 #                                         (default: editable)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 build_${PY_LIB}_python() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    build-${PY_LIB}-python-${t:-${type:-"editable"}} ${__rest__[@]};
+    build-${PY_LIB}-python-${t:-${type:-"editable"}} "${OPTS[@]}";
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 9219166fa..4f3aa8b26 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -8,6 +8,7 @@
 # Boolean options:
 #  -h,--help,--usage                      print this text
 #  -v,--verbose                           verbose output
+#  --ignore-requires-python               Ignore the Requires-Python information.
 #  --no-clean                             Don't clean up build directories.
 #  --no-deps                              Don't install package dependencies.
 #  --no-verify                            Don't verify if built wheel is valid.
@@ -26,6 +27,7 @@
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
 #                                         (default: 1)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#                                         (default: $(nproc))
 #  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
@@ -33,7 +35,6 @@
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
 #  --cache-dir <dir>                      Store the cache data in <dir>.
-#  --ignore-requires-python               Ignore the Requires-Python information.
 #  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
 #                                         adds to the existing value. Accepts either ":all:" to disable all source
 #                                         packages, ":none:" to empty the set, or one or more package names with commas
@@ -42,42 +43,36 @@
 #  -w,--wheel-dir <dir>                   copy built wheel into <dir>
 #                                         (default: none)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 build_${PY_LIB}_python_wheel() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
     fi
 
-    local verbose="${v:-${verbose:-}}";
-    local wheel_dir="${w:-${wheel_dir:-}}";
-
     eval "$(                                    \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
-      | xargs -r -d'\n' -I% echo -n local %\;   \
     )";
 
     local cmake_args=(${PY_CMAKE_ARGS});
 
-    if test -n "${verbose}"; then
+    if test -n "${v}"; then
         cmake_args+=("--log-level=VERBOSE");
     fi
 
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});
-    cmake_args+=(${verbose:+--log-level=VERBOSE});
-    cmake_args+=(${__rest__[@]});
+    cmake_args+=(${v:+--log-level=VERBOSE});
+    cmake_args+=("${OPTS[@]}");
 
     local ninja_args=();
     local pip_args=(${PIP_WHEEL_ARGS});
 
-    if test -n "${verbose}"; then
+    if test -n "${v}"; then
         ninja_args+=("-v");
         pip_args+=("-vv");
     fi
@@ -164,9 +159,10 @@ build_${PY_LIB}_python_wheel() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
   || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-wheel"*}" ); then
+  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-wheel"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index ed8279d6c..16d298be6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -8,12 +8,10 @@
 # Boolean options:
 #  -h,--help,--usage            print this text
 
-. devcontainer-utils-parse-args-from-docstring;
-
 clean_${PY_LIB}_python() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
@@ -47,8 +45,9 @@ clean_${PY_LIB}_python() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-${PY_LIB}-python"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-${PY_LIB}-python"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index 29cd723a2..567455da7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -9,29 +9,26 @@
 #  -h,--help,--usage print this text
 #  -v,--verbose      verbose output
 
-. devcontainer-utils-parse-args-from-docstring;
-
 uninstall_${PY_LIB}_python() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
-
-    local verbose="${v:-${verbose:-}}";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
     fi
 
     time (
-        pip uninstall -y ${verbose:+-vv} "${PY_LIB}";
+        pip uninstall -y ${v:+-vv} "${PY_LIB}";
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} uninstall time:";
     ) 2>&1;
 
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-${PY_LIB}-python"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-${PY_LIB}-python"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
index 1b92444e4..84dbe2df4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
@@ -19,33 +19,37 @@
 #                                         limit.
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
-#  -t,--type editable|wheel               The type of Python build to run (editable or wheel)
+#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
 #                                         (default: editable)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 build_${NAME}() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -v,--verbose
+        -a,--archs
+        -j,--parallel
+        -m,--max-device-obj-memory-usage
+    ' - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
         if type build-${lib}-cpp >/dev/null 2>&1; then
-            build-${lib}-cpp ${__rest__[@]};
+            build-${lib}-cpp "${OPTS[@]}";
         fi
     done
 
     for lib in ${PY_LIB}; do
         if type build-${lib}-python >/dev/null 2>&1; then
-            build-${lib}-python --type ${t:-${type:-"editable"}} ${__rest__[@]};
+            build-${lib}-python-${t:-${type:-"editable"}} "${OPTS[@]}";
         fi
     done
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${NAME}"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"build-${NAME}"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
index ed66235e0..2304ccdb9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
@@ -6,14 +6,12 @@
 # Clean the ${NAME} repository.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
-
-. devcontainer-utils-parse-args-from-docstring;
+#  -h,--help,--usage  print this text
 
 clean_${NAME}() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
         if type clean-${lib}-cpp >/dev/null 2>&1; then
@@ -28,8 +26,9 @@ clean_${NAME}() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-${NAME}"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clean-${NAME}"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 6a9c2832c..dec3d6362 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -20,29 +20,25 @@
 #  -d,--directory <dir>         clone the repo into <dir>
 #                               (default: `${NAME}.path` in manifest.yaml)
 #  -j,--parallel <num>          Clone <num> submodules in parallel
+#                               (default: $(nproc --ignore=1))
 #  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
 #                               (default: `${NAME}.git.upstream` in manifest.yaml)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 clone_${NAME}() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        --no-fork
+        --clone-upstream
+    ' - <<< "${@@Q}")";
 
     if [[ ! -d "${SRC_PATH}"/.git ]]; then
 
-        eval "$(                                    \
-            rapids-get-num-archs-jobs-and-load "$@" \
-          | xargs -r -d'\n' -I% echo -n local %\;   \
-        )";
+        eval "$(rapids-get-num-archs-jobs-and-load "$@")";
 
-        local no_fork="${no_fork:-}";
-        local no_update_env="${no_update_env:-}";
-        local clone_upstream="${clone_upstream:-}";
-        local branch="${b:-${branch:-"${GIT_TAG}"}}";
-        local directory="${d:-${directory:-"${SRC_PATH}"}}";
-        local upstream="${u:-${upstream:-"${GIT_UPSTREAM}/${GIT_REPO}"}}";
+        branch="${b:-"${GIT_TAG}"}";
+        directory="${d:-"${SRC_PATH}"}";
+        upstream="${u:-"${GIT_UPSTREAM}/${GIT_REPO}"}";
 
         echo 'Cloning ${NAME}' 1>&2;
 
@@ -52,9 +48,8 @@ clone_${NAME}() {
             --recurse-submodules                  \
             -j ${n_jobs:-$(nproc --ignore=1)}     \
             -c checkout.defaultRemote=upstream    \
-            ${no_fork:+--no-fork 1}               \
-            ${clone_upstream:+--clone-upstream 1} \
-            ${__rest__[@]}                        \
+            "${OPTS[@]}"                          \
+            --                                    \
             "${upstream}"                         \
             "${directory}"                        \
         ;
@@ -68,7 +63,7 @@ clone_${NAME}() {
 
         git -C "${SRC_PATH}" remote prune upstream;
 
-        if test -z "${no_update_env:-}"; then
+        if test -z "${no_update_env}"; then
             rapids-update-content-command;
             rapids-post-attach-command;
         fi
@@ -76,8 +71,9 @@ clone_${NAME}() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clone-${NAME}"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"clone-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"clone-${NAME}"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
index ca559845a..353a9a299 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
@@ -23,12 +23,10 @@
 #                                         (default: 1)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 configure_${NAME}() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
         if type configure-${lib}-cpp >/dev/null 2>&1; then
@@ -38,8 +36,9 @@ configure_${NAME}() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-${NAME}"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"configure-${NAME}"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
new file mode 100755
index 000000000..01347a2a5
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  cpack-${NAME} [OPTION]...
+#
+# CPack ${CPP_LIB}.
+#
+# Boolean options:
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
+#
+# Options that require values:
+#  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
+#                               (default: none)
+
+cpack_${NAME}() {
+    set -Eeuo pipefail;
+
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+
+    for lib in ${CPP_LIB}; do
+        if type cpack-${lib}-cpp >/dev/null 2>&1; then
+            cpack-${lib}-cpp "$@";
+        fi
+    done
+}
+
+if test -n "${rapids_build_utils_debug:-}" \
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"cpack-${NAME}"*}"; }; then
+    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+fi
+
+cpack_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
index 3f0c9bc87..130cc6447 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
@@ -19,12 +19,10 @@
 #                                               (default: all)
 #  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
 
-. devcontainer-utils-parse-args-from-docstring;
-
 install_${NAME}() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
         if type install-${lib}-cpp >/dev/null 2>&1; then
@@ -34,8 +32,9 @@ install_${NAME}() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-${NAME}"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"install-${NAME}"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index 3b68afb01..07f099c1d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -9,12 +9,10 @@
 #  -h,--help,--usage  print this text
 #  -v,--verbose       verbose output
 
-. devcontainer-utils-parse-args-from-docstring;
-
 uninstall_${NAME}() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
         if type uninstall-${lib}-cpp >/dev/null 2>&1; then
@@ -30,8 +28,9 @@ uninstall_${NAME}() {
 }
 
 if test -n "${rapids_build_utils_debug:-}" \
-&& ( test -z "${rapids_build_utils_debug##*"all"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-${NAME}"*}" ); then
+&& { test -z "${rapids_build_utils_debug##*"*"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
+  || test -z "${rapids_build_utils_debug##*"uninstall-${NAME}"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/utils/.bash_completion b/features/src/utils/.bash_completion
index 72022b122..bb6788acb 100755
--- a/features/src/utils/.bash_completion
+++ b/features/src/utils/.bash_completion
@@ -1,7 +1,14 @@
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
 if [ -d ~/.bash_completion.d ]; then
   for i in ~/.bash_completion.d/*; do
-    if [ -r $i ]; then
-      . $i
+    if [ -r "$i" ]; then
+      # shellcheck disable=SC1090
+      . "$i" 2>/dev/null
     fi
   done
   unset i
diff --git a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
index 74bd2f526..c6b3b34eb 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
@@ -1,108 +1,137 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=SC1091
 . devcontainer-utils-parse-args-from-docstring;
 
-_zip_lines() {
+_zip_names_and_types() {
     local line_1="";
     local args_1=();
     local line_2="";
     while read -r line_1; do
-        args_1=(${line_1});
+        read -ra args_1 <<< "${line_1}";
         while read -r line_2; do
             local idx;
             for ((idx=0; idx < ${#args_1[@]}; idx+=1)); do
-                echo "${line_2}";
+                echo "${args_1[${idx}]} ${line_2}";
             done
             break;
         done < "${2}";
     done < "${1}";
 }
 
-${NAME}_script="";
-${NAME}_usage="";
-${NAME}_bool_names=();
-${NAME}_value_names=();
-${NAME}_value_types="";
-${NAME}_option_names="";
+declare -A usage=();
+declare -A script=();
+declare -A bool_names=();
+declare -A value_names=();
+declare -A value_types="";
+declare -A option_names="";
 
-_${NAME}_completions() {
+_devcontainer_utils_completions() {
     # trap 'sleep 10;' EXIT;
 
     COMPREPLY=();
 
-    if test -z "${${NAME}_script}"; then
-        ${NAME}_script="$(which ${CMD})";
-        if test -z "${${NAME}_script}"; then return; fi
+    local CMD="$1";
+
+    if test "${script[${CMD}]:-}" != "$(which "${CMD}")"; then
+        script["${CMD}"]="$(which "${CMD}")";
+        if test ${#script["${CMD}"]} -eq 0; then return; fi
+        unset "usage[${CMD}]";
+        unset "bool_names[${CMD}]";
+        unset "value_names[${CMD}]";
+        unset "value_types[${CMD}]";
+        unset "option_names[${CMD}]";
     fi
-    if test -z "${${NAME}_usage}"; then
-        ${NAME}_usage="$(sed -n '2,/^$/p' "${${NAME}_script}" | sed -r 's/^# ?//')";
-        if test -z "${${NAME}_usage}"; then return; fi
+    if ! test -v usage["${CMD}"]; then
+        usage["${CMD}"]="$(sed -n '2,/^$/p' "${script[${CMD}]}" | sed -r 's/^# ?//')";
+        if test ${#usage[${CMD}]} -eq 0; then return; fi
     fi
-    if test "${#${NAME}_bool_names[@]}" -eq 0; then
-        ${NAME}_bool_names=($(parse_bool_names_from_usage <<< "${${NAME}_usage}"));
+    if test "${#bool_names[${CMD}]}" -eq 0; then
+        bool_names["${CMD}"]="$(parse_bool_names_from_usage <<< "${usage[${CMD}]}")";
     fi
-    if test "${#${NAME}_value_names[@]}" -eq 0; then
-        ${NAME}_value_names=($(parse_value_names_from_usage <<< "${${NAME}_usage}"));
+    if test "${#value_names[${CMD}]}" -eq 0; then
+        value_names["${CMD}"]="$(parse_value_names_from_usage <<< "${usage[${CMD}]}")";
     fi
-    if test -z "${${NAME}_value_types}"; then
-        ${NAME}_value_types="$(_zip_lines                          \
-            <(parse_value_names_from_usage <<< "${${NAME}_usage}") \
-            <(parse_value_types_from_usage <<< "${${NAME}_usage}") \
+    if ! test -v value_types["${CMD}"]; then
+        value_types["${CMD}"]="$(_zip_names_and_types              \
+            <(parse_value_names_from_usage <<< "${usage[${CMD}]}") \
+            <(parse_value_types_from_usage <<< "${usage[${CMD}]}") \
         )";
     fi
-    if test -z "${${NAME}_option_names}"; then
-        ${NAME}_option_names="${${NAME}_bool_names[*]} ${${NAME}_value_names[*]}";
+    if ! test -v option_names["${CMD}"]; then
+        option_names["${CMD}"]="${bool_names[${CMD}]} ${value_names[${CMD}]}";
     fi
 
-    local type_;
-    local idx_a=0;
-    local idx_b=0;
-
     if test "${COMP_CWORD}" -gt 1; then
-        for ((idx_a=0; idx_a < ${#${NAME}_value_names[@]}; idx_a+=1)); do
-            if [[ ${${NAME}_value_names[$idx_a]} == ${COMP_WORDS[$COMP_CWORD-1]}* ]]; then
-                while read -r type_; do
-                    if test ${idx_b} != ${idx_a}; then
-                        idx_b=$((idx_b + 1));
-                        continue;
-                    fi
-                    case "${type_}" in
-                        num)
-                            COMPREPLY=($(grep -P "^[0-9]+$" <<< "${COMP_WORDS[$COMP_CWORD]}"));
-                            ;;
-                        dir)
-                            COMPREPLY=($(compgen -o nosort -o dirnames -- "${COMP_WORDS[$COMP_CWORD]}"));
-                            ;;
-                        file)
-                            COMPREPLY=($(compgen -o nosort -o filenames -- "${COMP_WORDS[$COMP_CWORD]}"));
-                            ;;
-                        path)
-                            COMPREPLY=($(compgen -o nosort -o default -- "${COMP_WORDS[$COMP_CWORD]}"));
-                            ;;
-                        *)
-                            COMPREPLY=();
-                            ;;
-                    esac
-                    break;
-                done <<< "${${NAME}_value_types}";
-                return;
+        while read -r name_and_type; do
+            local -a pair;
+            read -a pair -r <<< "${name_and_type}";
+            local name_="${pair[0]}";
+            local type_="${pair[1]}";
+            if [[ ${name_} == ${COMP_WORDS[$COMP_CWORD-1]}* ]]; then
+                case "${type_}" in
+                    "<num>")
+                        # shellcheck disable=SC2207
+                        COMPREPLY=($(grep -P "^[0-9]+$" <<< "${COMP_WORDS[$COMP_CWORD]}"));
+                        return;
+                        ;;
+                    "<dir>")
+                        # shellcheck disable=SC2207
+                        COMPREPLY=($(compgen -o nosort -o dirnames -- "${COMP_WORDS[$COMP_CWORD]}"));
+                        return;
+                        ;;
+                    "<file>")
+                        # shellcheck disable=SC2207
+                        COMPREPLY=($(compgen -o nosort -o filenames -- "${COMP_WORDS[$COMP_CWORD]}"));
+                        return;
+                        ;;
+                    "<path>")
+                        # shellcheck disable=SC2207
+                        COMPREPLY=($(compgen -o nosort -o default -- "${COMP_WORDS[$COMP_CWORD]}"));
+                        return;
+                        ;;
+                    \(*\))
+                        local -a list=();
+                        IFS=$'|' read -a list -r <<< "${type_:1:-1}";
+                        if test ${#COMP_WORDS[$COMP_CWORD]} -eq 0; then
+                            COMPREPLY=("${list[@]}");
+                        else
+                            for item in "${list[@]}"; do
+                                if [[ ${item} =~ ^${COMP_WORDS[$COMP_CWORD]} ]]; then
+                                    COMPREPLY+=("${item}");
+                                fi
+                            done
+                        fi
+                        return;
+                        ;;
+                    *)
+                        COMPREPLY=();
+                        return;
+                        ;;
+                esac
             fi
-        done
+        done <<< "${value_types[${CMD}]}";
     fi
 
-    for ((idx_a=0; idx_a < ${#${NAME}_bool_names[@]}; idx_a+=1)); do
-        if [[ ${${NAME}_bool_names[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
-            COMPREPLY=($(compgen -o nosort -W "${${NAME}_option_names}" -- "${COMP_WORDS[$COMP_CWORD]}"));
+    declare -a bools="(${bool_names[${CMD}]})";
+
+    for ((idx_a=0; idx_a < ${#bools[@]}; idx_a+=1)); do
+        if [[ ${bools[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
+            # shellcheck disable=SC2207
+            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${COMP_WORDS[$COMP_CWORD]}"));
             return;
         fi
     done
 
-    for ((idx_a=0; idx_a < ${#${NAME}_value_names[@]}; idx_a+=1)); do
-        if [[ ${${NAME}_value_names[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
-            COMPREPLY=($(compgen -o nosort -W "${${NAME}_option_names}" -- "${COMP_WORDS[$COMP_CWORD]}"));
+    declare -a value="(${value_names[${CMD}]})";
+
+    for ((idx_a=0; idx_a < ${#value[@]}; idx_a+=1)); do
+        if [[ ${value[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
+            # shellcheck disable=SC2207
+            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${COMP_WORDS[$COMP_CWORD]}"));
             return;
         fi
     done
 }
 
-complete -F _${NAME}_completions ${CMD};
+# complete -F _devcontainer_utils_completions ${CMD};
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index 2c688e086..c1836730b 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -16,31 +16,34 @@
 #  -t,--template <path>         Path to the bash completion script template file
 #                               (default: `which devcontainer-utils-bash-completion.tmpl`)
 
-. devcontainer-utils-parse-args-from-docstring;
-
 generate_bash_completion() {
+    local -;
 
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    local command="${c:-${command:?-c|--command is required}}";
-    local out_dir="$(realpath -m "${o:-${out_dir:-"${HOME}/.bash_completion.d"}}")";
-    local template="${t:-${template:-${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}}}";
+    local -r command="${c:-${command:?-c|--command is required}}";
+    local -r out_dir="$(realpath -m "${o:-${out_dir:-"${HOME}/.bash_completion.d"}}")";
+    local -r template="${t:-${template:-${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}}}";
 
     if test -f "${template}"; then
         mkdir -p "${out_dir}";
-        cat "${template}"                     \
-      | CMD="${command}"                      \
-        NAME="${command//-/_}"                \
-        envsubst '$CMD $NAME'                 \
-      | tee "${out_dir}/${command}" >/dev/null;
+        local file="${out_dir}/devcontainer-utils-completions";
+        if ! test -f "${file}"; then
+            cp "${template}" "${file}";
+        fi
+
+        local str="complete -F _devcontainer_utils_completions ${command};";
+        if ! grep -q "${str}" "${file}"; then
+            echo "${str}" >> "${file}";
+        fi
     fi
 }
 
 if test -n "${devcontainer_utils_debug:-}" \
-&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
-  || test -z "${devcontainer_utils_debug##*"generate-bash-completion"*}" ); then
+&& { test -z "${devcontainer_utils_debug##*"*"*}" \
+  || test -z "${devcontainer_utils_debug##*"generate-bash-completion"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/git/init.sh b/features/src/utils/opt/devcontainer/bin/git/init.sh
index 8af915b28..0babb7470 100755
--- a/features/src/utils/opt/devcontainer/bin/git/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/init.sh
@@ -53,4 +53,4 @@ init_git_cli_config() {
     fi
 }
 
-(init_git_cli_config "$@");
+init_git_cli_config "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index e029498c0..0aa5f2c44 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -9,6 +9,7 @@
 #
 # Boolean options:
 #  -h,--help,--usage            print this text
+#  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
 #  --no-update-env              don't update the Python env with the repo's dependencies after cloning
@@ -25,33 +26,34 @@
 # Positional arguments:
 #  directory                    clone the repo into <directory>
 
-. devcontainer-utils-parse-args-from-docstring;
-
 clone_git_repo() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -q,--quiet
+        -j,--parallel
+    ' - <<< "${@@Q}")";
+
+    local quiet="${q:-${quiet:-}}";
+    quiet=${quiet:+--quiet};
 
     local branch="${b:-"${branch:-}"}";
     local parallel="${j:-${parallel:-1}}";
     local upstream="${u:-"${upstream:-}"}";
 
-    local nargs="${#__rest__[@]}";
-    local origin="${__rest__[$((nargs - 2))]}";
+    local nargs="${#REST[@]}";
+    local origin="${REST[$((nargs - 2))]}";
     origin="${origin:?origin is required}";
 
-    local directory="${__rest__[$((nargs - 1))]}";
+    local directory="${REST[$((nargs - 1))]}";
     directory="${directory:?directory is required}";
 
-    __rest__=("${__rest__[@]/"${origin}"}");
-    __rest__=("${__rest__[@]/"${directory}"}");
-
     upstream="${upstream:-"${origin}"}";
 
     if [ ! -d "${directory}"/.git ]; then
-        git clone ${__rest__[@]} "${origin}" "${directory}";
-        git -C "${directory}" remote add -f upstream "${upstream}" || true;
-        git -C "${directory}" remote set-url upstream "${upstream}" || true;
+        git clone "${OPTS[@]}" -- "${origin}" "${directory}";
+        git -C "${directory}" remote add upstream "${upstream}" || true;
+        git -C "${directory}" fetch "${quiet}" -j "${parallel}" upstream || true;
         git -C "${directory}" remote set-url --push upstream read_only || true;
 
         if [ "${upstream}" != "${origin}" ]; then
@@ -63,26 +65,28 @@ clone_git_repo() {
 
     if [ -n "${branch:-}" ]; then
 
-        local origin_has_tag="$(git -C "${directory}" ls-remote -t origin "${branch}")";
-        local origin_has_branch="$(git -C "${directory}" ls-remote -h origin "${branch}")";
-        local upstream_has_tag="$(git -C "${directory}" ls-remote -t upstream "${branch}")";
-        local upstream_has_branch="$(git -C "${directory}" ls-remote -h upstream "${branch}")";
+        local -r upstream_has_branch="$(git -C "${directory}" ls-remote -q --exit-code -h upstream "${branch}" && echo 1 || echo)";
+        local -r upstream_has_tag="$(git -C "${directory}" ls-remote -q --exit-code -t upstream "${branch}" && echo 1 || echo)";
+        local -r origin_has_branch="$(git -C "${directory}" ls-remote -q --exit-code -h origin "${branch}" && echo 1 || echo)";
+        local -r origin_has_tag="$(git -C "${directory}" ls-remote -q --exit-code -t origin "${branch}" && echo 1 || echo)";
 
         if false; then exit 1;
         elif test -n "${upstream_has_branch}"; then
-            if ! git -C "${directory}" checkout -b "${branch}" -t "upstream/${branch}" 2>/dev/null; then
-                git -C "${directory}" checkout "${branch}";
+            git -C "${directory}" fetch "${quiet}" upstream "refs/heads/${branch}";
+            if ! git -C "${directory}" checkout "${quiet}" -b "${branch}" -t "upstream/${branch}" 2>/dev/null; then
+                git -C "${directory}" checkout "${quiet}" "${branch}";
                 git -C "${directory}" branch "${branch}" -u "upstream/${branch}";
             fi
         elif test -n "${upstream_has_tag}"; then
-            git -C "${directory}" checkout -m -b "upstream/${branch}" "${branch}";
+            git -C "${directory}" checkout "${quiet}" -m -b "upstream/${branch}" "${branch}";
         elif test -n "${origin_has_branch}"; then
-            if ! git -C "${directory}" checkout -b "${branch}" -t "origin/${branch}" 2>/dev/null; then
-                git -C "${directory}" checkout "${branch}";
+            git -C "${directory}" fetch "${quiet}" origin "refs/heads/${branch}";
+            if ! git -C "${directory}" checkout "${quiet}" -b "${branch}" -t "origin/${branch}" 2>/dev/null; then
+                git -C "${directory}" checkout "${quiet}" "${branch}";
                 git -C "${directory}" branch "${branch}" -u "origin/${branch}";
             fi
         elif test -n "${origin_has_tag}"; then
-            git -C "${directory}" checkout -f -b "origin/${branch}" "${branch}";
+            git -C "${directory}" checkout "${quiet}" -f -b "origin/${branch}" "${branch}";
         fi
 
         if test -n "${origin_has_branch}"; then
@@ -94,13 +98,13 @@ clone_git_repo() {
         fi
     fi
 
-    git -C "${directory}" submodule update --init --recursive -j ${parallel};
+    git -C "${directory}" submodule update --init --recursive -j "${parallel}" "${quiet}";
 }
 
 if test -n "${devcontainer_utils_debug:-}" \
-&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+&& { test -z "${devcontainer_utils_debug##*"*"*}" \
   || test -z "${devcontainer_utils_debug##*"clone"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone-git-repo"*}" ); then
+  || test -z "${devcontainer_utils_debug##*"clone-git-repo"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/github/cli/init.sh b/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
index 22272fc85..bee6860f6 100755
--- a/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
@@ -15,7 +15,7 @@ init_github_cli() {
     if [[ "${CODESPACES:-false}" == "true" ]]; then
         git_protocol="https";
     else
-        if grep -q "You've successfully authenticated" <<< "$(ssh -T git@${GITHUB_HOST:-github.com} 2>&1)"; then
+        if grep -q "You've successfully authenticated" <<< "$(ssh -T "git@${GITHUB_HOST:-github.com}" 2>&1)"; then
             git_protocol="ssh";
             if type ssh-keygen > /dev/null 2>&1; then
                 avoid_gh_cli_ssh_keygen_prompt=1;
@@ -23,16 +23,12 @@ init_github_cli() {
         fi
     fi
 
-    scope_flags() {
-        echo -n "$(echo -n "${@}" | xargs -r -n1 -d' ' echo -n ' --scopes')";
-    }
-
-    local active_scopes="$(GITHUB_TOKEN=     \
-        gh api -i -X GET --silent rate_limit \
-        2>/dev/null                          \
-      | grep -i 'x-oauth-scopes:'            \
-      | cut -d' ' -f1 --complement           \
-      | tr -d ','                            \
+    local -r active_scopes="$(GITHUB_TOKEN="" \
+        gh api -i -X GET --silent rate_limit  \
+        2>/dev/null                           \
+      | grep -i 'x-oauth-scopes:'             \
+      | cut -d' ' -f1 --complement            \
+      | tr -d ','                             \
     )";
 
     local needed_scopes="read:org";
@@ -57,31 +53,34 @@ init_github_cli() {
         done
     fi
 
+    read -ra scopes <<< "${active_scopes} ${needed_scopes}";
+
+    # shellcheck disable=SC2068
     if ! gh auth status >/dev/null 2>&1; then
         echo "Logging into GitHub..." >&2;
 
-        local ssh_keygen="$(which ssh-keygen || echo "")";
+        local -r ssh_keygen="$(which ssh-keygen || echo "")";
 
         if [ -n "${ssh_keygen}" ] \
         && [ -n "${avoid_gh_cli_ssh_keygen_prompt}" ]; then
-            sudo mv $ssh_keygen{,.bak} || true;
+            sudo mv "${ssh_keygen}"{,.bak} || true;
         fi
 
         gh auth login \
-            --web --git-protocol ${git_protocol} \
+            --web --git-protocol ${git_protocol}    \
             --hostname "${GITHUB_HOST:-github.com}" \
-            $(scope_flags ${active_scopes} ${needed_scopes}) \
+            ${scopes[@]/#/--scopes }                \
         || echo "Continuing without logging into GitHub";
 
         if [ -n "${ssh_keygen}" ] \
         && [ -n "${avoid_gh_cli_ssh_keygen_prompt}" ]; then
-            sudo mv $ssh_keygen{.bak,} || true;
+            sudo mv "${ssh_keygen}"{.bak,} || true;
         fi
     elif [ -n "${needed_scopes}" ]; then
         echo "Logging into GitHub..." >&2;
         gh auth refresh \
             --hostname "${GITHUB_HOST:-github.com}" \
-            $(scope_flags ${active_scopes} ${needed_scopes}) \
+            ${scopes[@]/#/--scopes }                \
         || echo "Continuing without logging into GitHub";
     fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index a08e58c4d..a2075ad3c 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -24,8 +24,6 @@
 #  upstream                     set <upstream> as the `upstream` remote
 #  directory                    clone the repo into <directory>
 
-. devcontainer-utils-parse-args-from-docstring;
-
 get_default_branch() {
     local repo="${1}";
     gh repo view "${repo}" --json defaultBranchRef --jq '.defaultBranchRef.name';
@@ -58,7 +56,7 @@ get_user_fork_name() {
     if [ "${user}" = "${owner}" ]; then
         echo "${owner}/${name}";
     else
-        local query="$(cat <<________EOF | tr -s '[:space:]'
+        local -r query="$(cat <<________EOF | tr -s '[:space:]'
             | map(select(
                 .parent.name == "${name}"
                 and
@@ -67,7 +65,8 @@ get_user_fork_name() {
             | map(.nameWithOwner)[]
 ________EOF
         )";
-        local nameWithOwner="$(gh repo list "${user}" --fork --json nameWithOwner --json parent --jq ". ${query}" 2>/dev/null || echo "err")";
+        local nameWithOwner;
+        nameWithOwner="$(gh repo list "${user}" --fork --json nameWithOwner --json parent --jq ". ${query}" 2>/dev/null || echo "err")";
         if [ "${nameWithOwner}" = "err" ]; then
             nameWithOwner="";
             for repo in $(gh repo list "${user}" --fork --json name --jq 'map(.name)[]'); do
@@ -84,10 +83,12 @@ ________EOF
 clone_github_repo() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -j,--parallel
+    ' - <<< "${@@Q}")";
 
-    local nargs="${#__rest__[@]}";
-    local upstream="${__rest__[$((nargs - 2))]}";
+    local nargs="${#REST[@]}";
+    local upstream="${REST[$((nargs - 2))]}";
     upstream="${upstream:?upstream is required}";
 
     local no_fork="${no_fork:-}";
@@ -95,12 +96,9 @@ clone_github_repo() {
     local parallel="${j:-${parallel:-1}}";
     local clone_upstream="${clone_upstream:-}";
 
-    local directory="${__rest__[$((nargs - 1))]}";
+    local directory="${REST[$((nargs - 1))]}";
     directory="${directory:?directory is required}";
 
-    __rest__=("${__rest__[@]/"${upstream}"}");
-    __rest__=("${__rest__[@]/"${directory}"}");
-
     local origin="${upstream}";
     local name=;
     local user=;
@@ -110,7 +108,8 @@ clone_github_repo() {
     if test -z "${no_fork:-}" && \
        test -z "${clone_upstream:-}" && \
        devcontainer-utils-shell-is-interactive; then
-        source devcontainer-utils-init-github-cli;
+        # shellcheck disable=SC1091
+        . devcontainer-utils-init-github-cli;
         user="${GITHUB_USER:-}";
     fi
 
@@ -131,8 +130,8 @@ clone_github_repo() {
          devcontainer-utils-shell-is-interactive; then
         while true; do
             local CHOICE;
-            read -p "'${GITHUB_HOST:-github.com}/${user}/${name}.git' not found.
-    Fork '${upstream}' into '${user}/${name}' now (y/n)? " CHOICE <$(tty)
+            read -rp "'${GITHUB_HOST:-github.com}/${user}/${name}.git' not found.
+    Fork '${upstream}' into '${user}/${name}' now (y/n)? " CHOICE <"$(tty)"
             case "${CHOICE:-}" in
                 [Nn]* ) origin="${upstream}"; break;;
                 [Yy]* ) origin="${user}/${name}";
@@ -143,7 +142,7 @@ clone_github_repo() {
         done
     fi
 
-    if test -n "${GITHUB_USER:-}"; then
+    if gh auth status >/dev/null 2>&1; then
         if [ "$(gh config get git_protocol)" = "ssh" ]; then
             origin="$(get_repo_ssh_url "${origin}")";
             upstream="$(get_repo_ssh_url "${upstream}")";
@@ -159,16 +158,16 @@ clone_github_repo() {
     devcontainer-utils-clone-git-repo         \
         ${branch:+--branch "${branch}"}       \
         ${upstream:+--upstream "${upstream}"} \
-        -j ${parallel}                        \
-        ${__rest__[@]}                        \
+        "${OPTS[@]}"                          \
+        --                                    \
         "${origin}" "${directory}"            \
         ;
 }
 
 if test -n "${devcontainer_utils_debug:-}" \
-&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+&& { test -z "${devcontainer_utils_debug##*"*"*}" \
   || test -z "${devcontainer_utils_debug##*"clone"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone-github-repo"*}" ); then
+  || test -z "${devcontainer_utils_debug##*"clone-github-repo"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
index 719985c4c..fff32c3bf 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
@@ -29,7 +29,7 @@ init_gitlab_cli() {
                 export GITLAB_USER=;
                 return;
             else
-                read -s -p "Please enter a GitLab API token (or leave blank to skip): " GITLAB_TOKEN <$(tty);
+                read -rsp "Please enter a GitLab API token (or leave blank to skip): " GITLAB_TOKEN <"$(tty)";
             fi
         fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 0f1e4c5ba..572fd12bb 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -23,8 +23,6 @@
 #  upstream                     set <upstream> as the `upstream` remote
 #  directory                    clone the repo into <directory>
 
-. devcontainer-utils-parse-args-from-docstring;
-
 get_default_branch() {
     local repo="${1}";
     glab api graphql -f query="$(cat <<________EOF | tr -s '[:space:]'
@@ -109,23 +107,21 @@ get_user_fork_name() {
 clone_gitlab_repo() {
     set -Eeuo pipefail;
 
-    parse_args_or_show_help - <<< "$@";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -j,--parallel
+    ' - <<< "${@@Q}")";
 
-    local nargs="${#__rest__[@]}";
-    local upstream="${__rest__[$((nargs - 2))]}";
+    local nargs="${#REST[@]}";
+    local upstream="${REST[$((nargs - 2))]}";
     upstream="${upstream:?upstream is required}";
 
     local no_fork="${no_fork:-}";
     local branch="${b:-"${branch:-}"}";
-    local parallel="${j:-${parallel:-1}}";
     local clone_upstream="${clone_upstream:-}";
 
-    local directory="${__rest__[$((nargs - 1))]}";
+    local directory="${REST[$((nargs - 1))]}";
     directory="${directory:?directory is required}";
 
-    __rest__=("${__rest__[@]/"${upstream}"}");
-    __rest__=("${__rest__[@]/"${directory}"}");
-
     local origin="${upstream}";
     local fork=;
     local name=;
@@ -135,7 +131,8 @@ clone_gitlab_repo() {
     if test -z "${no_fork:-}" && \
        test -z "${clone_upstream:-}" && \
        devcontainer-utils-shell-is-interactive; then
-        source devcontainer-utils-init-gitlab-cli;
+        # shellcheck disable=SC1091
+        . devcontainer-utils-init-gitlab-cli;
         user="${GITLAB_USER:-}";
     fi
 
@@ -156,8 +153,8 @@ clone_gitlab_repo() {
          devcontainer-utils-shell-is-interactive; then
         while true; do
             local CHOICE;
-            read -p "'${GITLAB_HOST:-gitlab.com}/${user}/${name}.git' not found.
-    Fork '${upstream}' into '${user}/${name}' now (y/n)? " CHOICE <$(tty)
+            read -rp "'${GITLAB_HOST:-gitlab.com}/${user}/${name}.git' not found.
+    Fork '${upstream}' into '${user}/${name}' now (y/n)? " CHOICE <"$(tty)"
             case "${CHOICE:-}" in
                 [Nn]* ) origin="${upstream}"; break;;
                 [Yy]* ) origin="${user}/${name}";
@@ -168,7 +165,7 @@ clone_gitlab_repo() {
         done
     fi
 
-    if test -n "${GITLAB_USER:-}"; then
+    if ! glab auth status 2>&1 | grep -q "No token provided"; then
         if [ "$(glab config get git_protocol)" = "ssh" ]; then
             origin="$(get_repo_ssh_url "${origin}")";
             upstream="$(get_repo_ssh_url "${upstream}")";
@@ -184,16 +181,16 @@ clone_gitlab_repo() {
     devcontainer-utils-clone-git-repo         \
         ${branch:+--branch "${branch}"}       \
         ${upstream:+--upstream "${upstream}"} \
-        -j ${parallel}                        \
-        ${__rest__[@]}                        \
+        "${OPTS[@]}"                          \
+        --                                    \
         "${origin}" "${directory}"            \
         ;
 }
 
 if test -n "${devcontainer_utils_debug:-}" \
-&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
+&& { test -z "${devcontainer_utils_debug##*"*"*}" \
   || test -z "${devcontainer_utils_debug##*"clone"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone-gitlab-repo"*}" ); then
+  || test -z "${devcontainer_utils_debug##*"clone-gitlab-repo"*}"; }; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
index 5651568ce..85e4a59b5 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -1,48 +1,79 @@
 #! /usr/bin/env bash
 
-if test -n "${devcontainer_utils_debug:-}" \
-&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
-  || test -z "${devcontainer_utils_debug##*"parse-args"*}" ); then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 print_usage() {
-    sed -n '2,/^$/p' "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}" | sed -r 's/^# ?//';
+    sed -n '2,/^$/p' "$(which "${1:-${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}}")" | sed -r 's/^# ?//';
 }
 
-parse_names_from_usage() {
+parse_args_to_names() {
     cat - \
-  | sed -rn 's/^([ ]*)(--?[^ ]+|,|_|\*)+(.*)$/\2/p' \
-  | sed -r 's/--?([^ ,]+)+,?/\1|/g' \
-  | sed -r 's/\*/\\*/g';
+  | sed -r 's/--?([^ ,]+)+/\1/g'    \
+  | sed -r 's/(,|\|)/ /g'           \
+  ;
+}
+
+parse_all_names_from_usage() {
+    cat - \
+  | sed -rn 's/^([ ]*)(--?[^*][^ *]+|,|_)+(.*)$/\2/p' \
+  | sed -r 's/(,|\|)/ /g' \
+  ;
 }
 
 parse_bool_names_from_usage() {
     cat - \
-  | sed -rn 's/^([ ]*)(--?[^ ]+|,|_)+([^<]*)$/\2/p' \
+  | sed -rn 's/^([ ]*)(--?[^ ]+|,|_)+([^<(]*)$/\2/p' \
   | sed -r 's/(,|\|)/ /g';
 }
 
 parse_value_names_from_usage() {
     cat - \
-  | sed -rn 's/^([ ]*)(--?[^ \*]+|,|_)+[ ]*<(.[^>]*).*$/\2/p' \
+  | sed -rn 's/^([ ]*)(--?[^ \*]+|,|_)+[ ]*[<(](.[^)>]*).*$/\2/p' \
   | sed -r 's/(,|\|)/ /g';
 }
 
 parse_value_types_from_usage() {
     cat - \
-  | sed -rn 's/^([ ]*)(--?[^ \*]+|,|_)+[ ]*<(.[^>]*).*$/\3/p';
-}
-
-parse_args_or_show_help() {
-    eval "$(                                                  \
-        devcontainer-utils-parse-args                         \
-            --names "$(print_usage | parse_names_from_usage)" \
-        "$@" <&0                                              \
-    | xargs -r -d'\n' -I% echo -n export %\;                  \
-    )";
-    if test -n "${h:-${help:-${usage:-}}}"; then
-        print_usage >&2;
-        exit 0;
-    fi
+  | sed -rn 's/^[ ]*(--?[^ \*]+|,|_)+[ ]*([<(].[^)>]*)([)>]).*$/\2\3/p';
+}
+
+parse_short_names() {
+    cat -                                   \
+  `# skip the long opts`                    \
+  | sed -r 's/([ ]?--[^ ,]+)+,?//g'         \
+  `# take the short opts`                   \
+  | sed -r 's/-([^ ,\*]+)+[,\*]?/\1/g'      \
+  `# trim whitespace`                       \
+  | tr -s '[:space:]'                       \
+  `# replace spaces with pipes`             \
+  | tr '[:space:]' '|'                      \
+  | rev | cut -d'|' -f1 --complement | rev  \
+  `# replace pipes with spaces`             \
+  | tr '|' ' '                              \
+    ;
+}
+
+parse_long_names() {
+    cat -                                        \
+  `# take the long opts`                         \
+  | sed -r 's/(-[^ ,\*]+)?[ ]?(--[^,]+)+,?/\2/g' \
+  `# remove the leading --`                      \
+  | sed -r 's/--?([^ ,]+)+/\1/g'                 \
+  `# trim whitespace`                            \
+  | tr -s '[:space:]'                            \
+  `# replace newlines with spaces`               \
+  | tr '[:space:]' ' '                           \
+  `# replace spaces with pipes`                  \
+  | sed -r 's/ /|/g'                             \
+  | rev | cut -d'|' -f1 --complement | rev       \
+  `# replace pipes with spaces`                  \
+  | tr '|' ' '                                   \
+    ;
+}
+
+parse_aliases() {
+    cat -                           \
+  | parse_args_to_names             \
+  | while read -r aliases; do
+        local -a ary="(${aliases})";
+        echo "[${ary[0]}]=\"${ary[*]:1}\"";
+    done
 }
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 645248f03..6cb6f27fb 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -1,130 +1,302 @@
 #! /usr/bin/env bash
 
+# shellcheck disable=SC1091
+. devcontainer-utils-parse-args-from-docstring;
+
 parse_args() {
-    set -euo pipefail;
+    local -;
 
-    local keys=();
-    local rest=();
-    declare -A dict;
+    set -Eeuo pipefail;
 
-    local vars="(.*)";
-    local vars_array=();
-    if [ "${1:-}" = "--names" ]; then
-        shift;
-        vars="$(tr -d '[:space:]' <<< "${1}"  | rev | cut -d'|' -f1 --complement | rev)";
-        vars_array=("${vars//|/ }");
-        readarray -t vars_array < <(
-            for str in "${vars_array[@]}"; do
-                printf '%d\t%s\n' "${#str}" "$str"
-            done | sort -k 1,1nr -k 2 | cut -f 2-
-        );
-        vars="(${vars})";
+    local -r usage="$(print_usage "${1:-}")";
+    shift;
+
+    local key;
+    local typ;
+    local val;
+    local -a arg;
+
+    local -A args=();
+    local -a opts=();
+    local -A typs=();
+    local -a rest=();
+
+    local -A skip_map=();
+    local -A reverse_alias_map=();
+    local -Ar alias_map="($(parse_all_names_from_usage     <<< "${usage}" | parse_aliases))";
+    local -ar long_bools="($(parse_bool_names_from_usage   <<< "${usage}" | parse_long_names))";
+    local -ar long_value="($(parse_value_names_from_usage  <<< "${usage}" | parse_long_names))";
+    local -ar short_bools="($(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names))";
+    local -ar short_value="($(parse_value_names_from_usage <<< "${usage}" | parse_short_names))";
+
+    if [ "${1:-}" = "--passthrough" ]; then
         shift;
+        if test -n "${1:-}"; then
+            local -ar pass_through="($(echo "${1}" | parse_args_to_names))";
+            for key in "${pass_through[@]}"; do
+                # shellcheck disable=SC2034
+                skip_map["${key}"]=1;
+            done
+            shift;
+        fi
+    fi
+
+    local -r optstring="$(                                           \
+        cat <(echo "${short_bools[@]}" | xargs -d' ' -I% echo -n %)  \
+            <(echo "${short_value[@]}" | xargs -d' ' -I% echo -n %:) \
+      | tr -d '[:space:]'                                            \
+    )";
+
+    if test ${#long_bools[@]} -gt 0 || test ${#long_value[@]} -gt 0; then
+        local longoptstring="-:";
     fi
 
+    shopt -s extglob;
+
+    local -r long_bools1="@($(echo -n "${long_bools[@]/%/ |}"   | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))";
+    local -r long_bools2="@($(echo -n "${long_bools[@]/%/ |}"   | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))=*";
+    local -r long_value1="@($(echo -n "${long_value[@]/%/ |}"   | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))";
+    local -r long_value2="@($(echo -n "${long_value[@]/%/ |}"   | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))=*";
+    local -r short_bools1="@($(echo -n "${short_bools[@]/%/ |}" | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))";
+    local -r short_value1="@($(echo -n "${short_value[@]/%/ |}" | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))";
+
+    for key in "${!alias_map[@]}"; do
+        args["${key}"]="";
+        local -a aliases="(${alias_map[${key}]})";
+        for alias in "${aliases[@]}"; do
+            reverse_alias_map["${alias}"]="${key}";
+        done
+    done
+
+    for key in "${long_bools[@]}" "${short_bools[@]}"; do typs[${key}]="bool"; done
+    for key in "${long_value[@]}" "${short_value[@]}"; do typs[${key}]="value"; done
+
     while test -n "${1:-}"; do
-        local arg="${1:-}";
-        local key=;
-        local val=;
 
-        if false; then
-            continue;
-        # read args from stdin
-        elif grep -qP '^-$' <<< "${arg:-}"; then
+        # read from stdin on hyphen
+        if test "${1:-}" == -; then
             shift;
-            eval set "-- $@ $(cat - | tr -s '[:space:]' | xargs -d'\n' -r echo -n)";
+            set -o noglob;
+            # read and split+glob with glob disabled
+            eval set "-- $* $(cat)";
+            set +o noglob;
             continue;
-        # --
-        elif grep -qP '^--$' <<< "${arg:-}"; then
-            shift;
-            rest+=("${@@Q}");
-            break;
-        # -foo=bar | --foo=bar
-        elif grep -qP '^--?[^\s]+=.*$' <<< "${arg:-}"; then
-            shift;
-            key="${arg#-}";
-            key="${key#-}";
-            key="${key%=*}";
-            val="${arg#*=}";
-        # -foo bar | --foo bar
-        elif grep -qP '^--?[^\s]+$' <<< "${arg:-}"; then
-            shift;
-            # -fooval
-            local found="";
-            if test "${#vars_array[@]}" -gt 0 \
-            && grep -qP "^--?${vars}([^\s])+$" <<< "${arg:-}"; then
-                for name in ${vars_array[@]}; do
-                    if grep -qP "^--?${name}([0-9]|\.)+$" <<< "${arg:-}"; then
-                        key="${name}";
-                        val="${arg#-}";
-                        val="${val#-}";
-                        val="${val#"${name}"}";
-                        found="1";
-                        break;
-                    fi
-                done
-            fi
-            if test -z "${found}"; then
-                key="${arg#-}";
-                key="${key#-}";
-                if ! grep -qE "^$" <<< "${1:-}"; then
-                    if grep -qP '^-.*$' <<< "${1}"; then
-                        val="true";
-                    else
-                        val="${1}";
-                        arg+=" ${val}";
-                        shift;
-                    fi
-                else
+        fi
+
+        while getopts ":${optstring}${longoptstring:-}" opt; do
+
+            arg=();
+            key=;
+            val=;
+
+            # shellcheck disable=SC2254
+            case "${opt}" in
+                # short opt is specified but missing a value
+                :)
+                    typ="value";
+                    key="${OPTARG}";
+                    arg+=("-${key}");
+                    ;;
+                # unknown short opt
+                \?)
+                    opts+=("${!OPTIND:-${OPTARG:+-$OPTARG}}");
+
+                    # Splice the argument at index `OPTIND` out of $@
+                    set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
+
+                    # Peek at the next argument.
+                    # If it begins with `-`, leave it for getopts.
+                    # Otherwise, shift it onto the skipped list.
+
+                    # Guard here because there may not be another argument
+                    # at index `OPTIND` after the splice we did above.
+                    val="${!OPTIND:-}";
+                    # Slice off the leading `-X`. Note, this only works
+                    # when getopts is in silent mode, i.e. when `:` is
+                    # at the front of getopts' optstring. If getopts is
+                    # not in silent mode, it does not populate `OPTARG`.
+                    val="${val#-"${OPTARG:-}"}";
+
+                    case "${val}" in
+                        # unknown short opt with value after =
+                        *=*) ;;
+                        # unknown short opt with possible value following
+                        *)
+                            if [ -n "${!OPTIND:-}" ] && [[ "${!OPTIND}" != -* ]]; then
+                                opts+=("${!OPTIND}");
+                                # Splice the argument at index `OPTIND` out of $@
+                                set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
+                            fi
+                            ;;
+                    esac
+                    break;
+                    ;;
+                # long opt
+                -)
+                    case "${OPTARG}" in
+                        # known bool opt
+                        $long_bools1)
+                            typ="bool";
+                            val="true";
+                            key="${OPTARG}";
+                            arg+=("--${key}");
+                            ;;
+                        # known bool opt with value after =
+                        $long_bools2)
+                            typ="bool";
+                            key="${OPTARG%=*}";
+                            val="${OPTARG#*=}";
+                            arg+=("--${key}=${val}");
+                            ;;
+                        # known value opt with value following
+                        $long_value1)
+                            typ="value";
+                            key="${OPTARG}";
+                            if [ -n "${!OPTIND:-}" ] && [[ "${!OPTIND}" != -* ]]; then
+                                val="${!OPTIND}";
+                                OPTIND=$((OPTIND + 1));
+                            fi
+                            arg+=("--${key}" "${val}");
+                            ;;
+                        # known value opt with value after =
+                        $long_value2)
+                            typ="value";
+                            key="${OPTARG%=*}";
+                            val="${OPTARG#*=}";
+                            arg+=("--${key}=${val}");
+                        ;;
+                        # unknown long opt with value after =
+                        *=*)
+                            opts+=("--${OPTARG}");
+                            ;;
+                        # unknown long opt with value following
+                        *)
+                            opts+=("--${OPTARG}");
+                            if [ -n "${!OPTIND:-}" ] && [[ "${!OPTIND}" != -* ]]; then
+                                opts+=("${!OPTIND}");
+                                OPTIND=$((OPTIND + 1));
+                            fi
+                            ;;
+                    esac
+                    ;;
+                # known bool opt
+                $short_bools1)
+                    typ="bool";
+                    key="${opt}";
                     val="true";
+                    arg+=("-${key}");
+                    ;;
+                # known value opt with value following
+                $short_value1)
+                    typ="value";
+                    key="${opt}";
+                    idx=$((OPTIND-1));
+                    case "${OPTARG:-}" in
+                        # If OPTARG arg begins with `-`, leave it for getopts.
+                        -*)
+                            arg+=("-${key}");
+                            OPTIND=$((OPTIND - 1));
+                            ;;
+                        # If the option and value are separated by `=`
+                        =*)
+                            # strip the `=` and use the right-hand side as the value
+                            val="${OPTARG#*=}";
+                            if [ -z "${val}" ] && [[ "${!OPTIND}" != -* ]]; then
+                                # Handle the case where there's an equals sign and a space between the value, e.g. `-v= foo`
+                                val="${!OPTIND}";
+                                OPTIND=$((OPTIND + 1));
+                            fi
+                            arg+=("-${key}=${val}");
+                            ;;
+                        *)
+                            val="${OPTARG:-}";
+                            idx=$((OPTIND-1));
+                            if test "${!idx:-}" != "${val}"; then
+                                arg+=("${!idx:-}");
+                            else
+                                arg+=("-${key}" "${val}");
+                            fi
+                            ;;
+                    esac
+                    ;;
+            esac
+
+            if test -n "${key}"; then
+
+                if test -v skip_map["${key}"]; then
+                    opts+=("${arg[@]}");
                 fi
-            fi
-        else
-            rest+=("${@@Q}");
-            break;
-        fi
 
-        if grep -qP "^${vars}$" <<< "${key}"; then
-            key="${key//-/_}";
-            keys+=("$key");
-            if test -v dict[$key]; then
-                dict[$key]+=" ${val@Q}";
-                if ! test -v __${key}_ary; then
-                    declare __${key}_ary;
-                    eval __${key}_ary="";
+                if test -v reverse_alias_map["${key}"]; then
+                    key="${reverse_alias_map["${key}"]}";
                 fi
-            else
-                dict[$key]="${val@Q}";
-            fi
-        else
-            rest+=("${arg}");
-        fi
-    done
 
-    keys+=("__rest__");
-    dict["__rest__"]="(${rest[@]})";
+                if test "${typ}" = bool; then
+                    args["${key}"]="${val@Q}";
+                elif test -z "${args["${key}"]}"; then
+                    args["${key}"]="${val@Q}";
+                else
+                    args["${key}"]+=" ${val@Q}";
+                fi
+            fi
 
-    keys=($(echo "${keys[@]}" | xargs -r -d' ' -n1 echo -e | sort -su));
+            # If the next arg is `--`, break so we handle it below instead of getopts eating it.
+            if [[ "${!OPTIND:-}" == -- ]]; then
+                rest=("${@:$((OPTIND+1))}");
+                OPTIND=1;
+                set --;
+                break;
+            fi
+        done # end getopts loop
 
-    { set +x; } 2>/dev/null;
+        shift "$((OPTIND - 1))";
 
-    local keyi=0;
+        OPTIND=1;
 
-    for ((keyi=0; keyi < ${#keys[@]}; keyi+=1)); do
-        key=${keys[$keyi]};
-        val=${dict[$key]};
-        if ! test -v __${key}_ary; then
-            echo "${key}=${val}";
-        else
-            echo "${key}=(${val})";
-        fi
+        while test $# -gt 0; do
+            val="${1}";
+            if [[ "${val}" == -- ]]; then
+                rest=("${@}");
+                set --;
+            elif [[ "${val}" != -* ]]; then
+                rest+=("${val}");
+                shift;
+            else
+                break;
+            fi
+        done
     done
+
+    if test -n "${args[h]:-}"; then
+        cat <<< "${usage}" >&2;
+        echo >&2;
+        echo "exit 0";
+    else
+        echo "declare -A ARGS; ARGS=(${args[*]@K})";
+        echo "declare -a OPTS; OPTS=(${opts[*]@Q})";
+        echo "declare -a REST; REST=(${rest[*]@Q})";
+
+        for key in "${!args[@]}"; do
+            if test "${typs["${key}"]}" = bool; then
+                echo "declare ${key//-/_}; ${key//-/_}=${args["${key}"]}";
+            else
+                echo "declare -a ${key//-/_}; ${key//-/_}=(${args["${key}"]})";
+            fi
+            local -a aliases="(${alias_map["${key}"]})";
+            for alias in "${aliases[@]}"; do
+                echo "declare -n ${alias//-/_}=${key//-/_}";
+            done
+        done
+    fi
 }
 
-if test -n "${devcontainer_utils_debug:-}" \
-&& ( test -z "${devcontainer_utils_debug##*"all"*}" \
-  || test -z "${devcontainer_utils_debug##*"parse-args"*}" ); then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
+if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = devcontainer-utils-parse-args ]; then
 
-(parse_args "$@");
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${devcontainer_utils_debug##*"parse-args"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
+    parse_args "$@" <&0;
+fi
diff --git a/features/src/utils/opt/devcontainer/bin/post-attach-command-entrypoint.sh b/features/src/utils/opt/devcontainer/bin/post-attach-command-entrypoint.sh
index b161acb3b..c9c893f4c 100755
--- a/features/src/utils/opt/devcontainer/bin/post-attach-command-entrypoint.sh
+++ b/features/src/utils/opt/devcontainer/bin/post-attach-command-entrypoint.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
-SKIP_DEVCONTAINER_UTILS_POST_ATTACH_COMMAND=;
+export SKIP_DEVCONTAINER_UTILS_POST_ATTACH_COMMAND=;
 
+# shellcheck disable=SC1091
 . devcontainer-utils-post-attach-command;
 
 exec "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/post-attach-command.sh b/features/src/utils/opt/devcontainer/bin/post-attach-command.sh
index 6111e7e8b..e8e11cab6 100755
--- a/features/src/utils/opt/devcontainer/bin/post-attach-command.sh
+++ b/features/src/utils/opt/devcontainer/bin/post-attach-command.sh
@@ -1,10 +1,12 @@
 #! /usr/bin/env bash
 
 if test -z "${SKIP_DEVCONTAINER_UTILS_POST_ATTACH_COMMAND:-}"; then
-    find ~/ -maxdepth 1 -exec bash -c "\
-    [ \$(stat --format '%u:%g' '{}') != $(id -u):$(id -g) ] \
-    && sudo chown -R $(id -u):$(id -g) {}" \;
+    find ~/ -maxdepth 1 -exec bash -c '\
+    [ $(stat -c "%u:%g" "$0") != "$1" ] && \
+    sudo chown -R "$1" "$0"' {} "$(id -u):$(id -g)" \;
 
+    # shellcheck disable=SC1091
     . devcontainer-utils-init-git;
+    # shellcheck disable=SC1091
     . devcontainer-utils-vault-s3-init;
 fi
diff --git a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
index ff14007ca..1b4bcda46 100755
--- a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
+++ b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
@@ -8,9 +8,9 @@ init_ssh_deploy_keys() {
     local line;
 
     ssh-add -L | while read -r line; do
-        local key="$(cut -d' ' -f2 <<< "${line}")";
-        local url="$(cut -d' ' -f3 <<< "${line}")";
-        local sha="$(md5sum --tag <<< "${key}" | cut -d' ' -f4)";
+        local -r key="$(cut -d' ' -f2 <<< "${line}")";
+        local -r url="$(cut -d' ' -f3 <<< "${line}")";
+        local -r sha="$(md5sum --tag <<< "${key}" | cut -d' ' -f4)";
 
         if [[ ${url} =~ ${re} ]]; then
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
index dc62cfa06..121c4b1de 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
@@ -5,27 +5,28 @@ get_vault_token() {
 
     set -euo pipefail;
 
-    local VAULT_HOST="$1";
-    local user_orgs="${@:2}";
-    local gh_token="$(gh auth token)";
+    local -r VAULT_HOST="$1";
+    local -r user_orgs=("${@:2}");
+    local -r gh_token="$(gh auth token)";
     local vault_token=null;
+    local o;
     local org;
 
-    for org in ${user_orgs}; do
-        for org in $(echo -e "${org}\n${org,,}\n${org^^}" | sort -su); do
-            vault_token="$(                                   \
-                curl -s                                       \
-                    -X POST                                   \
-                    -H "Content-Type: application/json"       \
-                    -d "{\"token\": \"$gh_token\"}"           \
-                    "$VAULT_HOST/v1/auth/github-${org}/login" \
-              | jq -r '.auth.client_token'                    \
+    for o in "${user_orgs[@]}"; do
+        for org in $(echo -e "${o}\n${o,,}\n${o^^}" | sort -su); do
+            vault_token="$(                                     \
+                curl -s                                         \
+                    -X POST                                     \
+                    -H "Content-Type: application/json"         \
+                    -d "{\"token\": \"${gh_token}\"}"           \
+                    "${VAULT_HOST}/v1/auth/github-${org}/login" \
+              | jq -r '.auth.client_token'                      \
             )";
-            if [[ "${vault_token:-null}" != null ]]; then
+            if test ${#vault_token} -gt 0; then
                 break;
             fi
         done
-        if [[ "${vault_token:-null}" != null ]]; then
+        if test ${#vault_token} -gt 0; then
             break;
         fi
     done
@@ -37,4 +38,4 @@ if test -n "${devcontainer_utils_debug:-}"; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(get_vault_token "$@");
+get_vault_token "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index cf503d718..02a2ccb03 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -16,13 +16,13 @@ generate_s3_creds() {
     # Remove existing credentials in case vault declines to issue new ones.
     rm -rf ~/.aws/{stamp,config,credentials};
 
-    devcontainer-utils-vault-s3-creds-persist <<< "
-        --bucket='${SCCACHE_BUCKET:-}'
-        --region='${SCCACHE_REGION:-}'
-    ";
+    devcontainer-utils-vault-s3-creds-persist - <<< \
+        --bucket="${SCCACHE_BUCKET:-}"              \
+        --region="${SCCACHE_REGION:-}"              ;
 
     # Initialize the GitHub CLI with the appropriate user scopes
-    source devcontainer-utils-init-github-cli;
+    # shellcheck disable=SC1091
+    . devcontainer-utils-init-github-cli;
 
     if test -z "${GITHUB_USER:-}"; then
         exit 1;
@@ -34,13 +34,13 @@ generate_s3_creds() {
     allowed_orgs="${allowed_orgs//;/|}";
     allowed_orgs="${allowed_orgs//,/|}";
 
-    local user_orgs="$(                              \
+    local -r user_orgs="$(                           \
         gh api user/orgs --jq '.[].login'            \
             -H "Accept: application/vnd.github+json" \
         | grep --color=never -iE "(${allowed_orgs})" \
     )";
 
-    if test -z "${user_orgs:-}"; then
+    if test "${#user_orgs}" -eq 0; then
         exit 1;
     fi
 
@@ -49,19 +49,19 @@ generate_s3_creds() {
     echo "with vault at '${VAULT_HOST}'.";
     echo ""
 
-    local vault_token="null";
+    local vault_token="";
 
     # Attempt to authenticate with GitHub
-    eval "$(devcontainer-utils-vault-auth-github "${VAULT_HOST}" ${user_orgs})";
+    eval "$(devcontainer-utils-vault-auth-github "${VAULT_HOST}" "${user_orgs}")";
 
-    if [ "${vault_token:-null}" = "null" ]; then
+    if test ${#vault_token} -eq 0; then
         echo "Your GitHub user was not recognized by vault. Skipping." >&2;
         exit 1;
     fi
 
     echo "Successfully authenticated with vault!";
 
-    local generated_at="$(date '+%s')";
+    local -r generated_at="$(date '+%s')";
     local ttl="${VAULT_S3_TTL:-"43200"}";
     local uri="${VAULT_S3_URI:-"v1/aws/creds/devs"}";
 
@@ -70,7 +70,7 @@ generate_s3_creds() {
     fi
 
     # Generate temporary AWS creds
-    local aws_creds="$(                         \
+    local -r aws_creds="$(                      \
         curl -s                                 \
             -X GET                              \
             -H "X-Vault-Token: ${vault_token}"  \
@@ -79,15 +79,15 @@ generate_s3_creds() {
         | jq -r '.data'                         \
     )";
 
-    local aws_access_key_id="$(jq -r '.access_key' <<< "${aws_creds}" || echo)";
-    local aws_secret_access_key="$(jq -r '.secret_key' <<< "${aws_creds}" || echo)";
+    local -r aws_access_key_id="$(jq -r '.access_key' <<< "${aws_creds}" || echo)";
+    local -r aws_secret_access_key="$(jq -r '.secret_key' <<< "${aws_creds}" || echo)";
 
-    if grep -qE "^null$" <<< "${aws_access_key_id:-null}"; then
+    if test ${#aws_access_key_id} -eq 0; then
         echo "Failed to retrieve AWS S3 credentials. Skipping." >&2;
         exit 1;
     fi
 
-    if grep -qE "^null$" <<< "${aws_secret_access_key:-null}"; then
+    if test ${#aws_secret_access_key} -eq 0; then
         echo "Failed to retrieve AWS S3 credentials. Skipping." >&2;
         exit 1;
     fi
@@ -101,13 +101,12 @@ generate_s3_creds() {
         AWS_SECRET_ACCESS_KEY="${aws_secret_access_key:-}" \
         devcontainer-utils-vault-s3-creds-propagate; then
         # Store creds in ~/.aws dir
-        devcontainer-utils-vault-s3-creds-persist <<< "
-            --stamp='${generated_at:-}'
-            --bucket='${SCCACHE_BUCKET:-}'
-            --region='${SCCACHE_REGION:-}'
-            --aws_access_key_id='${aws_access_key_id:-}'
-            --aws_secret_access_key='${aws_secret_access_key:-}'
-        ";
+        devcontainer-utils-vault-s3-creds-persist - <<<         \
+            --stamp="${generated_at:-}"                         \
+            --bucket="${SCCACHE_BUCKET:-}"                      \
+            --region="${SCCACHE_REGION:-}"                      \
+            --aws-access-key-id="${aws_access_key_id:-}"        \
+            --aws-secret-access-key="${aws_secret_access_key:-}";
     fi
 }
 
@@ -117,4 +116,5 @@ fi
 
 generate_s3_creds "$@";
 
+# shellcheck disable=SC1090
 . /etc/profile.d/*-devcontainer-utils.sh;
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index bbd78d51f..e6cb558fd 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -1,4 +1,32 @@
-#! /usr/bin/env bash
+#!/usr/bin/env bash
+
+# Usage:
+#  devcontainer-utils-vault-s3-creds-persist [OPTION]...
+#
+# Set, unset, or reset the S3 bucket, region, and credentials in the environment.
+#
+# Boolean options:
+#  -h,--help,--usage              print this text
+#  --no-bucket                    Unset the $SCCACHE_BUCKET environment variable for all shells.
+#                                 (default: false)
+#  --no-region                    Unset the $SCCACHE_REGION environment variable for all shells.
+#                                 (default: false)
+#  --no-credentials               Set the $SCCACHE_S3_NO_CREDENTIALS environment variable for all shells to 1.
+#                                 (default: false)
+#
+# Options that require values:
+#  --stamp <stamp>                Timestamp when the S3 credentials were generated.
+#                                 (default: none)
+#  --bucket <bucket>              Set the $SCCACHE_BUCKET environment variable for all shells to <bucket> and persist in ~/.aws/config.
+#                                 (default: none)
+#  --region <region>              Set the $SCCACHE_REGION environment variable for all shells to <region> and persist in ~/.aws/config.
+#                                 (default: none)
+#  --aws-access-key-id <id>       Set the $AWS_ACCESS_KEY_ID environment variable for all shells to <id> and persist in ~/.aws/credentials.
+#                                 (default: none)
+#  --aws-session-token <token>    Set the $AWS_SESSION_TOKEN environment variable for all shells to <token> and persist in ~/.aws/credentials.
+#                                 (default: none)
+#  --aws-secret-access-key <key>  Set the $AWS_SECRET_ACCESS_KEY environment variable for all shells to <key> and persist in ~/.aws/credentials.
+#                                 (default: none)
 
 export_envvar() {
     if [ -n "${1:-}" ]; then
@@ -29,34 +57,11 @@ reset_envvar() {
     fi
 }
 
-store_s3_creds() {
+persist_s3_creds() {
 
     set -euo pipefail;
 
-    local stamp=;
-    local bucket=;
-    local region=;
-    local no_bucket=;
-    local no_region=;
-    local no_credentials=;
-    local aws_access_key_id=;
-    local aws_session_token=;
-    local aws_secret_access_key=;
-
-    eval "$(                                  \
-        devcontainer-utils-parse-args --names '
-            stamp                             |
-            bucket                            |
-            region                            |
-            no_bucket                         |
-            no_region                         |
-            no_credentials                    |
-            aws_access_key_id                 |
-            aws_session_token                 |
-            aws_secret_access_key             |
-        ' - <&0                               \
-      | xargs -r -d'\n' -I% echo -n local %\; \
-    )";
+    eval "$(devcontainer-utils-parse-args devcontainer-utils-vault-s3-creds-persist "$@" <&0)";
 
     # Reset envvars
     reset_envvar "SCCACHE_BUCKET";
@@ -92,7 +97,7 @@ ________EOF
     fi
 
     if test -f ~/.aws/config; then
-        cat <<________EOF > ~/.aws/config
+        cat <<________EOF > ~/.aws/config2 && mv ~/.aws/config{2,}
 [default]
 $(cat ~/.aws/config)
 ________EOF
@@ -121,7 +126,7 @@ ____________EOF
         fi
 
         if test -f ~/.aws/credentials; then
-            cat <<____________EOF > ~/.aws/credentials
+            cat <<____________EOF > ~/.aws/credentials2 && mv ~/.aws/credentials{2,}
 [default]
 $(cat ~/.aws/credentials)
 ____________EOF
@@ -134,4 +139,4 @@ if test -n "${devcontainer_utils_debug:-}"; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(store_s3_creds "$@");
+persist_s3_creds "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
index 941905dd9..6c0633b29 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
@@ -40,4 +40,4 @@ if test -n "${devcontainer_utils_debug:-}"; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(ensure_s3_creds_have_propagated "$@");
+ensure_s3_creds_have_propagated "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index 612c04435..32ea61915 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -4,19 +4,19 @@ schedule_s3_creds_refresh() {
 
     set -euo pipefail;
 
-    local now="$(date '+%s')";
+    local -r now="$(date '+%s')";
     local ttl="${VAULT_S3_TTL:-"43200"}";
     ttl="${ttl%s}";
 
-    local stamp="$(cat ~/.aws/stamp 2>/dev/null || echo "${now}")";
+    local -r stamp="$(cat ~/.aws/stamp 2>/dev/null || echo "${now}")";
     local then="$((ttl - (now - stamp)))";
     then="$((then < ttl ? ttl : then))";
     then="$((((then + 59) / 60) * 60))";
     then="$((now + then))";
 
-    crontab -u $(whoami) -r 2>/dev/null || true;
+    crontab -u "$(whoami)" -r 2>/dev/null || true;
 
-    cat <<____EOF | crontab -u $(whoami) -
+    cat <<____EOF | crontab -u "$(whoami)" -
 SHELL=/bin/bash
 BASH_ENV="${BASH_ENV:-}"
 VAULT_HOST="${VAULT_HOST:-}"
@@ -37,4 +37,4 @@ if test -n "${devcontainer_utils_debug:-}"; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(schedule_s3_creds_refresh "$@");
+schedule_s3_creds_refresh "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
index 85a1f46ff..8418bf79c 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -9,8 +9,8 @@ test_aws_creds() {
     if ! type sccache >/dev/null 2>&1; then exit 1; fi
 
     if test -f ~/.aws/stamp; then
-        local now="$(date '+%s')";
-        local stamp="$(cat ~/.aws/stamp)";
+        local -r now="$(date '+%s')";
+        local -r stamp="$(cat ~/.aws/stamp)";
         local ttl="${VAULT_S3_TTL:-"43200"}";
         if [ $((now - stamp)) -ge "${ttl%s}" ]; then
             exit 1;
@@ -64,4 +64,4 @@ if test -n "${devcontainer_utils_debug:-}"; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(test_aws_creds "$@");
+test_aws_creds "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index bcabe313e..46800b58c 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -1,22 +1,12 @@
 #! /usr/bin/env bash
 
-s3_bucket_args() {
-    cat <<____EOF
-        --bucket='${SCCACHE_BUCKET:-}'
-        --region='${SCCACHE_REGION:-"${AWS_DEFAULT_REGION:-}"}'
-____EOF
-}
-
-s3_bucket_auth() {
-    cat <<____EOF
-        --aws_access_key_id='$(grep 'aws_access_key_id=' ~/.aws/credentials 2>/dev/null | sed 's/aws_access_key_id=//' || echo)'
-        --aws_session_token='$(grep 'aws_session_token=' ~/.aws/credentials 2>/dev/null | sed 's/aws_session_token=//' || echo)'
-        --aws_secret_access_key='$(grep 'aws_secret_access_key=' ~/.aws/credentials 2>/dev/null | sed 's/aws_secret_access_key=//' || echo)'
-____EOF
+s3_cred() {
+    grep "$1=" ~/.aws/credentials 2>/dev/null | sed "s/$1=//" || echo;
 }
 
 init_vault_s3_creds() {
 
+    local -
     set -euo pipefail;
 
     if type sccache >/dev/null; then
@@ -25,36 +15,42 @@ init_vault_s3_creds() {
             && grep -qE "^$" <<< "${AWS_SECRET_ACCESS_KEY:-}" ; then
                 if test -n "${VAULT_HOST:-}"                  ; then
                     # Generate S3 creds if they don't exist (or are expired)
-                    if devcontainer-utils-vault-s3-creds-test 2>&1 >/dev/null\
+                    if devcontainer-utils-vault-s3-creds-test >/dev/null 2>&1 \
                     || devcontainer-utils-vault-s3-creds-generate; then
                         # Persist creds in ~/.aws dir
-                        devcontainer-utils-vault-s3-creds-persist <<< "
-                            $(s3_bucket_args)
-                            $(s3_bucket_auth)
-                        ";
+                        devcontainer-utils-vault-s3-creds-persist - <<<               \
+                            --bucket="${SCCACHE_BUCKET:-}"                            \
+                            --region="${SCCACHE_REGION:-${AWS_DEFAULT_REGION:-}}"     \
+                            --aws-access-key-id="$(s3_cred aws_access_key_id)"        \
+                            --aws-session-token="$(s3_cred aws_session_token)"        \
+                            --aws-secret-access-key="$(s3_cred aws_secret_access_key)";
                         # Install a crontab to refresh the credentials
                         devcontainer-utils-vault-s3-creds-schedule;
                     else
-                        devcontainer-utils-vault-s3-creds-persist <<< "--no_bucket --no_region";
+                        devcontainer-utils-vault-s3-creds-persist - <<< --no-bucket --no-region;
                     fi
                 else
                     # If credentials have been mounted in, ensure they're used
                     case $(devcontainer-utils-vault-s3-creds-test; echo $?) in
                         # bucket is read + write with the current credentials
                         [0] )
-                            devcontainer-utils-vault-s3-creds-persist <<< "
-                                $(s3_bucket_args)
-                                $(s3_bucket_auth)
-                            ";;
+                            devcontainer-utils-vault-s3-creds-persist - <<<               \
+                                --bucket="${SCCACHE_BUCKET:-}"                            \
+                                --region="${SCCACHE_REGION:-${AWS_DEFAULT_REGION:-}}"     \
+                                --aws-access-key-id="$(s3_cred aws_access_key_id)"        \
+                                --aws-session-token="$(s3_cred aws_session_token)"        \
+                                --aws-secret-access-key="$(s3_cred aws_secret_access_key)";
+                            ;;
                         # bucket is read-only and should be accessed without credentials
                         [2] )
-                            devcontainer-utils-vault-s3-creds-persist <<< "
-                                --no_credentials
-                                $(s3_bucket_args)
-                            ";;
+                            devcontainer-utils-vault-s3-creds-persist - <<<          \
+                                --no-credentials                                     \
+                                --bucket="${SCCACHE_BUCKET:-}"                       \
+                                --region="${SCCACHE_REGION:-${AWS_DEFAULT_REGION:-}}";
+                            ;;
                           # bucket is inaccessible
                           * )
-                            devcontainer-utils-vault-s3-creds-persist <<< "--no_bucket --no_region";;
+                            devcontainer-utils-vault-s3-creds-persist - <<< --no-bucket --no-region;;
                     esac
                 fi
             elif devcontainer-utils-vault-s3-creds-propagate; then
@@ -62,6 +58,7 @@ init_vault_s3_creds() {
                 echo -n "";
             fi
         fi
+        # shellcheck disable=SC1090
         . /etc/profile.d/*-devcontainer-utils.sh;
         # start the sccache server
         sccache --start-server >/dev/null 2>&1 || true;
@@ -72,6 +69,7 @@ if test -n "${devcontainer_utils_debug:-}"; then
     PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 fi
 
-(init_vault_s3_creds "$@");
+init_vault_s3_creds "$@";
 
+# shellcheck disable=SC1090
 . /etc/profile.d/*-devcontainer-utils.sh;

From 6cba6e6cd895530859b240bcdd427dcaaf614190 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 28 Jan 2024 21:11:09 -0800
Subject: [PATCH 062/217] don't quote flags

---
 .../opt/devcontainer/bin/git/repo/clone.sh    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 0aa5f2c44..fab4ac02d 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -39,6 +39,8 @@ clone_git_repo() {
 
     local branch="${b:-"${branch:-}"}";
     local parallel="${j:-${parallel:-1}}";
+    parallel="${parallel:+-j "${parallel}"}";
+
     local upstream="${u:-"${upstream:-}"}";
 
     local nargs="${#REST[@]}";
@@ -53,7 +55,8 @@ clone_git_repo() {
     if [ ! -d "${directory}"/.git ]; then
         git clone "${OPTS[@]}" -- "${origin}" "${directory}";
         git -C "${directory}" remote add upstream "${upstream}" || true;
-        git -C "${directory}" fetch "${quiet}" -j "${parallel}" upstream || true;
+        # shellcheck disable=SC2086
+        git -C "${directory}" fetch ${quiet} ${parallel} upstream || true;
         git -C "${directory}" remote set-url --push upstream read_only || true;
 
         if [ "${upstream}" != "${origin}" ]; then
@@ -70,23 +73,24 @@ clone_git_repo() {
         local -r origin_has_branch="$(git -C "${directory}" ls-remote -q --exit-code -h origin "${branch}" && echo 1 || echo)";
         local -r origin_has_tag="$(git -C "${directory}" ls-remote -q --exit-code -t origin "${branch}" && echo 1 || echo)";
 
+        # shellcheck disable=SC2086
         if false; then exit 1;
         elif test -n "${upstream_has_branch}"; then
-            git -C "${directory}" fetch "${quiet}" upstream "refs/heads/${branch}";
-            if ! git -C "${directory}" checkout "${quiet}" -b "${branch}" -t "upstream/${branch}" 2>/dev/null; then
-                git -C "${directory}" checkout "${quiet}" "${branch}";
+            git -C "${directory}" fetch ${quiet} upstream "refs/heads/${branch}";
+            if ! git -C "${directory}" checkout ${quiet} -b "${branch}" -t "upstream/${branch}" 2>/dev/null; then
+                git -C "${directory}" checkout ${quiet} "${branch}";
                 git -C "${directory}" branch "${branch}" -u "upstream/${branch}";
             fi
         elif test -n "${upstream_has_tag}"; then
-            git -C "${directory}" checkout "${quiet}" -m -b "upstream/${branch}" "${branch}";
+            git -C "${directory}" checkout ${quiet} -m -b "upstream/${branch}" "${branch}";
         elif test -n "${origin_has_branch}"; then
-            git -C "${directory}" fetch "${quiet}" origin "refs/heads/${branch}";
-            if ! git -C "${directory}" checkout "${quiet}" -b "${branch}" -t "origin/${branch}" 2>/dev/null; then
-                git -C "${directory}" checkout "${quiet}" "${branch}";
+            git -C "${directory}" fetch ${quiet} origin "refs/heads/${branch}";
+            if ! git -C "${directory}" checkout ${quiet} -b "${branch}" -t "origin/${branch}" 2>/dev/null; then
+                git -C "${directory}" checkout ${quiet} "${branch}";
                 git -C "${directory}" branch "${branch}" -u "origin/${branch}";
             fi
         elif test -n "${origin_has_tag}"; then
-            git -C "${directory}" checkout "${quiet}" -f -b "origin/${branch}" "${branch}";
+            git -C "${directory}" checkout ${quiet} -f -b "origin/${branch}" "${branch}";
         fi
 
         if test -n "${origin_has_branch}"; then
@@ -98,7 +102,8 @@ clone_git_repo() {
         fi
     fi
 
-    git -C "${directory}" submodule update --init --recursive -j "${parallel}" "${quiet}";
+    # shellcheck disable=SC2086
+    git -C "${directory}" submodule update --init --recursive ${parallel} ${quiet};
 }
 
 if test -n "${devcontainer_utils_debug:-}" \

From 0b0346f56d62fbf40dfe9baa2440c9756ea1874e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 28 Jan 2024 22:39:16 -0800
Subject: [PATCH 063/217] set -E, use local - in functions, cleanup

---
 features/src/llvm/llvm.sh                     |  1 +
 .../bin/checkout-same-branch.sh               | 14 ++++---
 .../bin/generate-scripts.sh                   | 23 +++++------
 .../bin/get-num-archs-jobs-and-load.sh        | 14 ++++---
 .../opt/rapids-build-utils/bin/list-repos.sh  | 14 ++++---
 .../bin/make-conda-dependencies.sh            | 14 ++++---
 .../rapids-build-utils/bin/make-conda-env.sh  | 14 ++++---
 .../bin/make-pip-dependencies.sh              | 14 ++++---
 .../rapids-build-utils/bin/make-pip-env.sh    | 16 ++++----
 .../bin/make-vscode-workspace.sh              | 40 ++++++++++---------
 .../bin/parse-cmake-args.sh                   |  4 +-
 .../bin/parse-cmake-var-from-args.sh          |  3 +-
 .../bin/parse-cmake-vars-from-args.sh         | 12 +++---
 .../bin/parse-valid-args.sh                   |  4 +-
 .../bin/pull-repositories.sh                  | 14 ++++---
 .../bin/push-repositories.sh                  | 14 ++++---
 .../bin/python-conda-pkg-names.sh             | 14 ++++---
 .../bin/python-pkg-names.sh                   |  1 +
 .../bin/python-pkg-roots.sh                   |  1 +
 .../rapids-build-utils/bin/query-manifest.sh  | 14 ++++---
 .../bin/tmpl/all.build.tmpl.sh                | 14 ++++---
 .../bin/tmpl/all.clean.tmpl.sh                | 14 ++++---
 .../bin/tmpl/all.clone.tmpl.sh                | 14 ++++---
 .../bin/tmpl/all.configure.tmpl.sh            | 14 ++++---
 .../bin/tmpl/all.cpack.tmpl.sh                | 14 ++++---
 .../bin/tmpl/all.install.tmpl.sh              | 14 ++++---
 .../rapids-build-utils/bin/tmpl/all.tmpl.sh   | 14 ++++---
 .../bin/tmpl/all.uninstall.tmpl.sh            | 14 ++++---
 .../bin/tmpl/cpp.build.tmpl.sh                | 16 ++++----
 .../bin/tmpl/cpp.clean.tmpl.sh                | 16 ++++----
 .../bin/tmpl/cpp.configure.tmpl.sh            | 16 ++++----
 .../bin/tmpl/cpp.cpack.tmpl.sh                | 16 ++++----
 .../bin/tmpl/cpp.install.tmpl.sh              | 16 ++++----
 .../bin/tmpl/cpp.uninstall.tmpl.sh            | 16 ++++----
 .../bin/tmpl/python.build.editable.tmpl.sh    | 18 +++++----
 .../bin/tmpl/python.build.tmpl.sh             | 16 ++++----
 .../bin/tmpl/python.build.wheel.tmpl.sh       | 18 +++++----
 .../bin/tmpl/python.clean.tmpl.sh             | 16 ++++----
 .../bin/tmpl/python.uninstall.tmpl.sh         | 16 ++++----
 .../bin/tmpl/repo.build.tmpl.sh               | 16 ++++----
 .../bin/tmpl/repo.clean.tmpl.sh               | 16 ++++----
 .../bin/tmpl/repo.clone.tmpl.sh               | 16 ++++----
 .../bin/tmpl/repo.configure.tmpl.sh           | 16 ++++----
 .../bin/tmpl/repo.cpack.tmpl.sh               | 16 ++++----
 .../bin/tmpl/repo.install.tmpl.sh             | 16 ++++----
 .../bin/tmpl/repo.uninstall.tmpl.sh           | 16 ++++----
 .../bin/bash/generate-bash-completion.sh      | 14 +++----
 .../utils/opt/devcontainer/bin/git/init.sh    |  4 +-
 .../opt/devcontainer/bin/git/repo/clone.sh    | 16 ++++----
 .../opt/devcontainer/bin/github/cli/init.sh   |  4 +-
 .../opt/devcontainer/bin/github/repo/clone.sh | 16 ++++----
 .../opt/devcontainer/bin/gitlab/cli/init.sh   |  4 +-
 .../opt/devcontainer/bin/gitlab/repo/clone.sh |  1 +
 .../utils/opt/devcontainer/bin/parse-args.sh  | 15 ++++---
 .../devcontainer/bin/ssh/init-deploy-keys.sh  | 13 +++---
 .../opt/devcontainer/bin/vault/auth/github.sh | 17 ++++----
 .../bin/vault/s3/creds/generate.sh            | 23 ++++++-----
 .../bin/vault/s3/creds/persist.sh             | 15 ++++---
 .../bin/vault/s3/creds/propagate.sh           | 15 ++++---
 .../bin/vault/s3/creds/schedule.sh            | 13 +++---
 .../devcontainer/bin/vault/s3/creds/test.sh   | 15 ++++---
 .../opt/devcontainer/bin/vault/s3/init.sh     | 13 +++---
 features/test/utils/ubuntu18.04.sh            |  2 +-
 features/test/utils/ubuntu20.04.sh            |  2 +-
 features/test/utils/ubuntu22.04.sh            |  2 +-
 65 files changed, 479 insertions(+), 374 deletions(-)

diff --git a/features/src/llvm/llvm.sh b/features/src/llvm/llvm.sh
index 20200a82a..5c8a7c38d 100755
--- a/features/src/llvm/llvm.sh
+++ b/features/src/llvm/llvm.sh
@@ -11,6 +11,7 @@
 set -eux
 
 usage() {
+    local -;
     set +x
     echo "Usage: $0 [llvm_major_version] [all] [OPTIONS]" 1>&2
     echo -e "all\t\t\tInstall all packages." 1>&2
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 5e6165920..753483b99 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -20,8 +20,16 @@
 #                        (default: all repositories)
 
 checkout_same_branch() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"checkout-same-branch"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(                                        \
@@ -136,10 +144,4 @@ checkout_same_branch() {
     done;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"checkout-same-branch"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 checkout_same_branch "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index e55a138c1..747071aa4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -7,17 +7,16 @@ TEMPLATES="${TEMPLATES:-/opt/rapids-build-utils/bin/tmpl}";
 TMP_SCRIPT_DIR="${TMP_SCRIPT_DIR:-/tmp/rapids-build-utils}";
 
 clean_completions() {
-
     local -;
+    set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
     && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
+        || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    set -euo pipefail;
-
     mkdir -p "${TMP_SCRIPT_DIR}";
     mkdir -p "${HOME}/.bash_completion.d";
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
@@ -33,17 +32,16 @@ clean_completions() {
 }
 
 generate_completions() {
-
     local -;
+    set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
     && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
+        || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    set -euo pipefail;
-
     mkdir -p "${HOME}/.bash_completion.d";
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
 
@@ -65,7 +63,7 @@ generate_completions() {
 
 clean_scripts() {
     local -;
-    set -euo pipefail;
+    set -Eeuo pipefail;
     mkdir -p "${TMP_SCRIPT_DIR}";
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
     sudo rm -f -- \
@@ -197,19 +195,18 @@ generate_python_scripts() {
 }
 
 generate_scripts() {
-
     local -;
+    set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
     && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
+        || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
     # Generate and install the "clone-<repo>" scripts
 
-    set -euo pipefail;
-
     # Ensure we're in this script's directory
     cd "$( cd "$( dirname "$(realpath -m "${BASH_SOURCE[0]}")" )" && pwd )";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 7850e3f66..17bc85b19 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -24,8 +24,16 @@
 #                                         (default: 1)
 
 get_num_archs_jobs_and_load() {
+    local -;
     set -Eeuo pipefail
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"get-num-archs-jobs-and-load"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if test ${#j[@]} -gt 0 && test -z "${j:-}"; then
@@ -88,10 +96,4 @@ ____EOF
     echo "declare n_load; n_load=${n_load}";
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"get-num-archs-jobs-and-load"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 get_num_archs_jobs_and_load "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 1d657d4ce..8b81fbbe8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -17,8 +17,16 @@
 #                        (default: all repositories)
 
 list_repos() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"list-repos"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -m,--manifest
     ' - <<< "${@@Q}")";
@@ -49,10 +57,4 @@ list_repos() {
     rapids-query-manifest "${OPTS[@]}" -- "${query}";
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-    || test -z "${rapids_build_utils_debug##*"list-repos"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 list_repos "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 3aecf7463..d3c18ae75 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -26,8 +26,16 @@ generate_env_yaml() {
 }
 
 make_conda_dependencies() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"make-conda-dependencies"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -m,--manifest
         -o,--omit
@@ -103,10 +111,4 @@ make_conda_dependencies() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-conda-dependencies"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 make_conda_dependencies "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 068159af3..5ed0a413b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -19,8 +19,16 @@
 #                        (default: all repositories)
 
 make_conda_env() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"make-conda-env"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.yml";
 
@@ -74,12 +82,6 @@ make_conda_env() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-conda-env"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 # shellcheck disable=SC1091
 . /opt/conda/etc/profile.d/conda.sh;
 # shellcheck disable=SC1091
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 190100d09..4a6f50e73 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -28,8 +28,16 @@ generate_requirements() {
 }
 
 make_pip_dependencies() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"make-pip-dependencies"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -m,--manifest
         -o,--omit
@@ -121,10 +129,4 @@ make_pip_dependencies() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-    || test -z "${rapids_build_utils_debug##*"make-pip-dependencies"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 make_pip_dependencies "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index d80f2a798..f223d0695 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -21,8 +21,16 @@
 #  -r,--requirement <file> Path(s) to additional requirement files to include.
 
 make_pip_env() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"make-pip-env"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.requirements.txt";
 
@@ -36,7 +44,7 @@ make_pip_env() {
     ' - <<< "${@@Q}")";
 
     # Remove the current virtual env if called with `-f|--force`
-    if test -n "${f:-${force:-}}"; then
+    if test -n "${force:-}"; then
         rm -rf "${HOME}/.local/share/venvs/${env_name}" \
                "${HOME}/.local/share/venvs/${env_file_name}";
     fi
@@ -84,12 +92,6 @@ make_pip_env() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-    || test -z "${rapids_build_utils_debug##*"make-pip-env"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 make_pip_env "${DEFAULT_VIRTUAL_ENV:-rapids}" "$@";
 
 if test -f "${HOME}/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
index 4c22fde6e..d9e788fc7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
@@ -2,15 +2,14 @@
 
 get_repos_ordered() {
     local project_manifest_yml="${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}";
-    local paths=($(yq eval '.repos[].path' "${project_manifest_yml}"));
+    readarray -t paths < <(yq eval '.repos[].path' "${project_manifest_yml}");
     for i in "${!paths[@]}"; do
         echo "$i ${paths[$i]}";
     done
 }
 
 get_repos() {
-    local repos="$(get_repos_ordered)";
-
+    local -r repos="$(get_repos_ordered)";
     join \
       <(echo "${repos}" | sort -k 1b,1)                           \
       <(find ~ -maxdepth 1 -mindepth 1 -type d ! -name '.*' -exec \
@@ -25,12 +24,12 @@ with_git_dirs() {
 
 lib_entries() {
     local lib;
-    while read lib; do
+    while read -r lib; do
         cat<<EOF
-{ "name": "$lib", "path": "$lib" }
+{ "name": "${lib}", "path": "${lib}" }
 EOF
-        cpp_lib_entries $lib;
-        python_lib_entries $lib;
+        cpp_lib_entries "${lib}";
+        python_lib_entries "${lib}";
     done;
 }
 
@@ -52,17 +51,18 @@ cpp_lib_dirs() {
     done
 }
 
+# shellcheck disable=SC2016
 cpp_lib_entries() {
-    cpp_lib_dirs "$@"                                  \
-  | xargs -r -d'\n' -I% realpath --relative-to=$HOME % \
-  | sort -bd                                           \
+    cpp_lib_dirs "$@"                                      \
+  | xargs -r -d'\n' -I% realpath --relative-to="${HOME}" % \
+  | sort -bd                                               \
   | xargs -r -d'\n' -I% bash -c 'cat<<EOF
 { "name": "${0/"$1/"/┕ }", "path": "$0" }
-EOF' % $1
+EOF' % "$1"
 }
 
 python_lib_entries() {
-    local py_dirs=($(rapids-python-pkg-roots -r $1 | sort -bd));
+    readarray -t py_dirs < <(rapids-python-pkg-roots -r "$1" | sort -bd);
     for i in "${!py_dirs[@]}"; do
         local py_dir="${py_dirs[$i]}";
         cat<<EOF
@@ -72,7 +72,15 @@ EOF
 }
 
 make_vscode_workspace() {
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"make-vscode-workspace"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     cat<<EOF
 {
@@ -90,12 +98,6 @@ $(get_repos | with_git_dirs \
 EOF
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"make-vscode-workspace"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 if echo "$@" | grep -qE '(\-u|\-\-update)'; then
     (make_vscode_workspace "$@" > /tmp/workspace.code-workspace);
     if ! diff -BNqw ~/workspace.code-workspace /tmp/workspace.code-workspace >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
index 7540df8dd..2e30ed0ea 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 parse_cmake_args() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
 
     local ARG="";
     local args=(-GNinja);
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
index 7864af748..ca10995d9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 parse_cmake_var_from_args() {
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
 
     eval "$(                                       \
         rapids-parse-cmake-vars-from-args "${@:2}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
index fa2cd34ae..3c3dfc866 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 join_with_delimiter() {
-    set -euo pipefail
+    local -;
+    set -Eeuo pipefail
     local IFS='' delim=${1:-};
     shift;
     echo -n "${1:-}";
@@ -10,12 +11,11 @@ join_with_delimiter() {
 }
 
 parse_cmake_vars_from_args() {
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
 
-    local args="";
-    args="$(rapids-parse-cmake-args "$@")";
-    args="$(join_with_delimiter "\n" "${args}")";
-    echo -e "$args" \
+    # shellcheck disable=SC2046
+    echo -e "$(join_with_delimiter "\n" $(rapids-parse-cmake-args "$@"))" \
   | grep '\-D' \
   | sed -r 's/^-D//';
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
index fbbc2224a..8dbd8ea36 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 parse_valid_args() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
 
     local -r cmd="$*";
     local -r hash="$(echo "$cmd" | tr -d'[:space:]')";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 9c2498a72..3154509b5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -17,8 +17,16 @@
 #                        (default: all repositories)
 
 pull_repositories() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"pull-repositories"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-list-repos "$@")";
@@ -62,10 +70,4 @@ Please enter a branch name to pull (or leave empty to skip): " branch_name </dev
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"pull-repositories"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 pull_repositories "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index 6f5c15f33..91e5c507b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -17,8 +17,16 @@
 #                        (default: all repositories)
 
 push_repositories() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"push-repositories"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-list-repos "$@")";
@@ -39,10 +47,4 @@ push_repositories() {
     done;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"push-repositories"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 push_repositories "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index 8f0bf7065..b3d2e02de 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -20,8 +20,16 @@
 #                        (default: all repositories)
 
 python_conda_pkg_names() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"python-conda-pkg-names"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-list-repos "$@")";
@@ -49,10 +57,4 @@ python_conda_pkg_names() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"python-conda-pkg-names"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 python_conda_pkg_names "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index c2294d303..e8881498b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -17,6 +17,7 @@
 #                        (default: all repositories)
 
 python_pkg_names() {
+    local -;
     set -Eeuo pipefail;
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index ff7583ae8..4cd7d512b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -17,6 +17,7 @@
 #                        (default: all repositories)
 
 python_pkg_roots() {
+    local -;
     set -Eeuo pipefail;
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index 0af7c6068..67c49f22f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -13,8 +13,16 @@
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
 
 query_manifest() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"query-manifest"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     local manifest="${m:-${manifest:-"${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}"}}";
@@ -47,10 +55,4 @@ ________EOF
     yq -Mo json "${manifest}" | jq -r "${query}";
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-    || test -z "${rapids_build_utils_debug##*"query-manifest"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 query_manifest "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
index 1dd2d1976..2a2981297 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -26,8 +26,16 @@
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 build_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
@@ -37,10 +45,4 @@ build_all() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 build_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index 946696868..a1d9c076f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -14,8 +14,16 @@
 #  -j,--parallel <num>          Clone <num> repos in parallel
 
 clean_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"clean-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
@@ -29,10 +37,4 @@ clean_all() {
     ";
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clean_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 321cd0bc5..3f288e142 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -19,8 +19,16 @@
 #                               (default: 1)
 
 clone_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"clone-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         --no-fork
         --clone-upstream
@@ -48,10 +56,4 @@ clone_all() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"clone-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clone_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
index 56dc8b4b7..6bd8589ca 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
@@ -24,8 +24,16 @@
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 configure_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"configure-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
@@ -35,10 +43,4 @@ configure_all() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 configure_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index 4f72ece89..ca59efca3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -16,8 +16,16 @@
 #                               (default: none)
 
 cpack_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"cpack-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
@@ -31,10 +39,4 @@ cpack_all() {
     ";
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"cpack-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 cpack_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
index 56b3dedac..36b2d2a8b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
@@ -22,8 +22,16 @@
 #  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
 
 install_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"install-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
@@ -33,10 +41,4 @@ install_all() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 install_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
index 9feb1449f..af123c9d7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
@@ -12,8 +12,16 @@
 #  -v,--verbose                           verbose output
 
 ${SCRIPT}_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"${SCRIPT}-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
@@ -23,10 +31,4 @@ ${SCRIPT}_all() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"${SCRIPT}-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 ${SCRIPT}_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
index 77c5ae95a..2a7d3258b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
@@ -12,8 +12,16 @@
 #  -v,--verbose                           verbose output
 
 uninstall_all() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for name in ${NAMES}; do
@@ -23,10 +31,4 @@ uninstall_all() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 uninstall_all "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index fb8891c9e..7d9b1e5d7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -23,8 +23,17 @@
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 build_${CPP_LIB}_cpp() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-${CPP_LIB}-cpp"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
@@ -50,11 +59,4 @@ build_${CPP_LIB}_cpp() {
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${CPP_LIB}-cpp"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 build_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index e77f30d5a..b24db7f8f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -9,8 +9,17 @@
 #  -h,--help,--usage  print this text
 
 clean_${CPP_LIB}_cpp() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"clean-${CPP_LIB}-cpp"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
@@ -21,11 +30,4 @@ clean_${CPP_LIB}_cpp() {
            "${CPP_SRC}"/compile_commands.json;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-${CPP_LIB}-cpp"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clean_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 7f170ff10..894c583eb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -23,8 +23,17 @@
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 configure_${CPP_LIB}_cpp() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"configure-${CPP_LIB}-cpp"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
@@ -73,11 +82,4 @@ configure_${CPP_LIB}_cpp() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-${CPP_LIB}-cpp"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 configure_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index cd82539a2..adf678b65 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -14,8 +14,17 @@
 #                               (default: none)
 
 cpack_${CPP_LIB}_cpp() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"cpack-${CPP_LIB}-cpp"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     time (
@@ -35,11 +44,4 @@ cpack_${CPP_LIB}_cpp() {
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"cpack-${CPP_LIB}-cpp"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 cpack_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index f2bdc9b26..8460226e2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -20,8 +20,17 @@
 #  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
 
 install_${CPP_LIB}_cpp() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"install-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -v,--verbose
         --strip
@@ -48,11 +57,4 @@ install_${CPP_LIB}_cpp() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 install_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 8aaa41e1f..253943c8b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -10,8 +10,17 @@
 #  -v,--verbose       verbose output
 
 uninstall_${CPP_LIB}_cpp() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"uninstall-${CPP_LIB}-cpp"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if test -f "${CPP_SRC}"/build/latest/install_manifest.txt; then
@@ -22,11 +31,4 @@ uninstall_${CPP_LIB}_cpp() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-${CPP_LIB}-cpp"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 uninstall_${CPP_LIB}_cpp "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index 46c025eca..8b4b8936a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -22,8 +22,18 @@
 #                                         (default: 1)
 
 build_${PY_LIB}_python_editable() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-editable"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
@@ -87,12 +97,4 @@ build_${PY_LIB}_python_editable() {
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-editable"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 build_${PY_LIB}_python_editable "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
index 6f45d741a..9a5b3c484 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
@@ -14,18 +14,20 @@
 #                                         (default: editable)
 
 build_${PY_LIB}_python() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     build-${PY_LIB}-python-${t:-${type:-"editable"}} "${OPTS[@]}";
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 build_${PY_LIB}_python "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 4f3aa8b26..7dda23ffb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -44,8 +44,18 @@
 #                                         (default: none)
 
 build_${PY_LIB}_python_wheel() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-wheel"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
@@ -158,12 +168,4 @@ build_${PY_LIB}_python_wheel() {
     ) 2>&1;
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-wheel"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 build_${PY_LIB}_python_wheel "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index 16d298be6..894957f15 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -9,8 +9,17 @@
 #  -h,--help,--usage            print this text
 
 clean_${PY_LIB}_python() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"clean-${PY_LIB}-python"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
@@ -44,11 +53,4 @@ clean_${PY_LIB}_python() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-${PY_LIB}-python"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clean_${PY_LIB}_python "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index 567455da7..dc4e318f8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -10,8 +10,17 @@
 #  -v,--verbose      verbose output
 
 uninstall_${PY_LIB}_python() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"uninstall-${PY_LIB}-python"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
@@ -25,11 +34,4 @@ uninstall_${PY_LIB}_python() {
 
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-${PY_LIB}-python"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 uninstall_${PY_LIB}_python "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
index 84dbe2df4..f9c2168b8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
@@ -24,8 +24,17 @@
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 build_${NAME}() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"build-${NAME}"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -v,--verbose
         -a,--archs
@@ -46,11 +55,4 @@ build_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"build-${NAME}"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 build_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
index 2304ccdb9..59c6af143 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
@@ -9,8 +9,17 @@
 #  -h,--help,--usage  print this text
 
 clean_${NAME}() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"clean-${NAME}"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
@@ -25,11 +34,4 @@ clean_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clean-${NAME}"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clean_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index dec3d6362..011019698 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -25,8 +25,17 @@
 #                               (default: `${NAME}.git.upstream` in manifest.yaml)
 
 clone_${NAME}() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"clone-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"clone-${NAME}"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         --no-fork
         --clone-upstream
@@ -70,11 +79,4 @@ clone_${NAME}() {
     fi
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"clone-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"clone-${NAME}"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clone_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
index 353a9a299..92f08e29b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
@@ -24,8 +24,17 @@
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 configure_${NAME}() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"configure-${NAME}"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
@@ -35,11 +44,4 @@ configure_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"configure-${NAME}"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 configure_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
index 01347a2a5..56decedb6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
@@ -14,8 +14,17 @@
 #                               (default: none)
 
 cpack_${NAME}() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"cpack-${NAME}"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
@@ -25,11 +34,4 @@ cpack_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"cpack-${NAME}"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 cpack_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
index 130cc6447..c9d8c9c9d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
@@ -20,8 +20,17 @@
 #  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
 
 install_${NAME}() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"install-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"install-${NAME}"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
@@ -31,11 +40,4 @@ install_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"install-${NAME}"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 install_${NAME} "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index 07f099c1d..fc8fd95aa 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -10,8 +10,17 @@
 #  -v,--verbose       verbose output
 
 uninstall_${NAME}() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
+      || test -z "${rapids_build_utils_debug##*"uninstall-${NAME}"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
@@ -27,11 +36,4 @@ uninstall_${NAME}() {
     done
 }
 
-if test -n "${rapids_build_utils_debug:-}" \
-&& { test -z "${rapids_build_utils_debug##*"*"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
-  || test -z "${rapids_build_utils_debug##*"uninstall-${NAME}"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 uninstall_${NAME} "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index c1836730b..d0abf8bae 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -18,9 +18,15 @@
 
 generate_bash_completion() {
     local -;
-
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${devcontainer_utils_debug##*"generate-bash-completion"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     local -r command="${c:-${command:?-c|--command is required}}";
@@ -41,10 +47,4 @@ generate_bash_completion() {
     fi
 }
 
-if test -n "${devcontainer_utils_debug:-}" \
-&& { test -z "${devcontainer_utils_debug##*"*"*}" \
-  || test -z "${devcontainer_utils_debug##*"generate-bash-completion"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 generate_bash_completion "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/git/init.sh b/features/src/utils/opt/devcontainer/bin/git/init.sh
index 0babb7470..3d65e6655 100755
--- a/features/src/utils/opt/devcontainer/bin/git/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/init.sh
@@ -1,8 +1,8 @@
 #! /usr/bin/env bash
 
 init_git_cli_config() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
 
     # PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index fab4ac02d..992d376bc 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -27,8 +27,17 @@
 #  directory                    clone the repo into <directory>
 
 clone_git_repo() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${devcontainer_utils_debug##*"clone"*}" \
+      || test -z "${devcontainer_utils_debug##*"clone-git-repo"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -q,--quiet
         -j,--parallel
@@ -106,11 +115,4 @@ clone_git_repo() {
     git -C "${directory}" submodule update --init --recursive ${parallel} ${quiet};
 }
 
-if test -n "${devcontainer_utils_debug:-}" \
-&& { test -z "${devcontainer_utils_debug##*"*"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone-git-repo"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clone_git_repo "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/github/cli/init.sh b/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
index bee6860f6..ae7a3ef5d 100755
--- a/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
@@ -1,8 +1,8 @@
 #! /usr/bin/env bash
 
 init_github_cli() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
 
     if ! type gh > /dev/null 2>&1; then
         export GITHUB_USER="";
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index a2075ad3c..3b7a3c133 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -81,8 +81,17 @@ ________EOF
 }
 
 clone_github_repo() {
+    local -;
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${devcontainer_utils_debug##*"clone"*}" \
+      || test -z "${devcontainer_utils_debug##*"clone-github-repo"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -j,--parallel
     ' - <<< "${@@Q}")";
@@ -164,11 +173,4 @@ clone_github_repo() {
         ;
 }
 
-if test -n "${devcontainer_utils_debug:-}" \
-&& { test -z "${devcontainer_utils_debug##*"*"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone-github-repo"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clone_github_repo "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
index fff32c3bf..1b99b34ce 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
@@ -13,8 +13,8 @@ _remove_warning_from_bashrc() {
 }
 
 init_gitlab_cli() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
 
     if ! type glab > /dev/null 2>&1; then
         export GITLAB_USER="";
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 572fd12bb..ab9145cf2 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -105,6 +105,7 @@ get_user_fork_name() {
 }
 
 clone_gitlab_repo() {
+    local -;
     set -Eeuo pipefail;
 
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 6cb6f27fb..8c1cbad11 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -5,9 +5,15 @@
 
 parse_args() {
     local -;
-
     set -Eeuo pipefail;
 
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"parse-args"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
     local -r usage="$(print_usage "${1:-}")";
     shift;
 
@@ -291,12 +297,5 @@ parse_args() {
 }
 
 if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = devcontainer-utils-parse-args ]; then
-
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"parse-args"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     parse_args "$@" <&0;
 fi
diff --git a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
index 1b4bcda46..a03251aa9 100755
--- a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
+++ b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
@@ -1,8 +1,15 @@
 #! /usr/bin/env bash
 
 init_ssh_deploy_keys() {
+    local -;
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"init-deploy-keys"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     local re="(ssh:\/\/|https:\/\/)?(git@)?(.*\.com)[:\/](.*)";
     local line;
@@ -45,8 +52,4 @@ ____________EOF
     chmod 0600 ~/.ssh/*;
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 init_ssh_deploy_keys "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
index 121c4b1de..2e171fc56 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
@@ -2,8 +2,15 @@
 
 
 get_vault_token() {
+    local -;
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"vault-auth-github"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     local -r VAULT_HOST="$1";
     local -r user_orgs=("${@:2}");
@@ -22,11 +29,11 @@ get_vault_token() {
                     "${VAULT_HOST}/v1/auth/github-${org}/login" \
               | jq -r '.auth.client_token'                      \
             )";
-            if test ${#vault_token} -gt 0; then
+            if test "${vault_token:-null}" != null; then
                 break;
             fi
         done
-        if test ${#vault_token} -gt 0; then
+        if test "${vault_token:-null}" != null; then
             break;
         fi
     done
@@ -34,8 +41,4 @@ get_vault_token() {
     echo "vault_token='$vault_token'";
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 get_vault_token "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index 02a2ccb03..a90e947de 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -3,8 +3,15 @@
 # Attempt to retrieve temporary AWS credentials from a vault instance using GitHub OAuth.
 
 generate_s3_creds() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-generate"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     if test -z "${VAULT_HOST:-}" \
     || test -z "${SCCACHE_BUCKET:-}"; then
@@ -49,12 +56,12 @@ generate_s3_creds() {
     echo "with vault at '${VAULT_HOST}'.";
     echo ""
 
-    local vault_token="";
+    local vault_token="null";
 
     # Attempt to authenticate with GitHub
     eval "$(devcontainer-utils-vault-auth-github "${VAULT_HOST}" "${user_orgs}")";
 
-    if test ${#vault_token} -eq 0; then
+    if [ "${vault_token:-null}" = "null" ]; then
         echo "Your GitHub user was not recognized by vault. Skipping." >&2;
         exit 1;
     fi
@@ -82,12 +89,12 @@ generate_s3_creds() {
     local -r aws_access_key_id="$(jq -r '.access_key' <<< "${aws_creds}" || echo)";
     local -r aws_secret_access_key="$(jq -r '.secret_key' <<< "${aws_creds}" || echo)";
 
-    if test ${#aws_access_key_id} -eq 0; then
+    if grep -qE "^null$" <<< "${aws_access_key_id:-null}"; then
         echo "Failed to retrieve AWS S3 credentials. Skipping." >&2;
         exit 1;
     fi
 
-    if test ${#aws_secret_access_key} -eq 0; then
+    if grep -qE "^null$" <<< "${aws_secret_access_key:-null}"; then
         echo "Failed to retrieve AWS S3 credentials. Skipping." >&2;
         exit 1;
     fi
@@ -110,10 +117,6 @@ generate_s3_creds() {
     fi
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 generate_s3_creds "$@";
 
 # shellcheck disable=SC1090
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index e6cb558fd..0dcc51d56 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -58,8 +58,15 @@ reset_envvar() {
 }
 
 persist_s3_creds() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-persist"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     eval "$(devcontainer-utils-parse-args devcontainer-utils-vault-s3-creds-persist "$@" <&0)";
 
@@ -135,8 +142,4 @@ ____________EOF
     fi
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 persist_s3_creds "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
index 6c0633b29..139b56018 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
@@ -1,8 +1,15 @@
 #! /usr/bin/env bash
 
 ensure_s3_creds_have_propagated() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-propagate"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     if ! type sccache >/dev/null 2>&1; then
         return;
@@ -36,8 +43,4 @@ ensure_s3_creds_have_propagated() {
     done
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 ensure_s3_creds_have_propagated "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index 32ea61915..d070cb7f2 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -1,8 +1,15 @@
 #! /usr/bin/env bash
 
 schedule_s3_creds_refresh() {
+    local -;
+    set -Eeuo pipefail;
 
-    set -euo pipefail;
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-schedule"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     local -r now="$(date '+%s')";
     local ttl="${VAULT_S3_TTL:-"43200"}";
@@ -33,8 +40,4 @@ ____EOF
     sudo /etc/init.d/cron restart >/dev/null 2>&1;
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 schedule_s3_creds_refresh "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
index 8418bf79c..a9046e16a 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -3,8 +3,15 @@
 # Test sccache AWS S3 credentials are valid
 
 test_aws_creds() {
-
-    set -euo pipefail;
+    local -;
+    set -Eeuo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-test"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     if ! type sccache >/dev/null 2>&1; then exit 1; fi
 
@@ -60,8 +67,4 @@ test_aws_creds() {
     exit 0;
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 test_aws_creds "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index 46800b58c..a02ac0e66 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -7,7 +7,14 @@ s3_cred() {
 init_vault_s3_creds() {
 
     local -
-    set -euo pipefail;
+    set -Eeuo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${devcontainer_utils_debug:-}" \
+    && { test -z "${devcontainer_utils_debug##*"*"*}" \
+      || test -z "${rapids_build_utils_debug##*"vault-s3-init"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
 
     if type sccache >/dev/null; then
         if test -n "${SCCACHE_BUCKET:-}"; then
@@ -65,10 +72,6 @@ init_vault_s3_creds() {
     fi
 }
 
-if test -n "${devcontainer_utils_debug:-}"; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 init_vault_s3_creds "$@";
 
 # shellcheck disable=SC1090
diff --git a/features/test/utils/ubuntu18.04.sh b/features/test/utils/ubuntu18.04.sh
index bb4f96c41..f03019467 100644
--- a/features/test/utils/ubuntu18.04.sh
+++ b/features/test/utils/ubuntu18.04.sh
@@ -7,7 +7,7 @@
 #     --base-image ubuntu:22.04 .'
 # ```
 
-set -euo pipefail
+set -Eeuo pipefail
 
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
diff --git a/features/test/utils/ubuntu20.04.sh b/features/test/utils/ubuntu20.04.sh
index bb4f96c41..f03019467 100644
--- a/features/test/utils/ubuntu20.04.sh
+++ b/features/test/utils/ubuntu20.04.sh
@@ -7,7 +7,7 @@
 #     --base-image ubuntu:22.04 .'
 # ```
 
-set -euo pipefail
+set -Eeuo pipefail
 
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
diff --git a/features/test/utils/ubuntu22.04.sh b/features/test/utils/ubuntu22.04.sh
index bb4f96c41..f03019467 100644
--- a/features/test/utils/ubuntu22.04.sh
+++ b/features/test/utils/ubuntu22.04.sh
@@ -7,7 +7,7 @@
 #     --base-image ubuntu:22.04 .'
 # ```
 
-set -euo pipefail
+set -Eeuo pipefail
 
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib

From a5127002ad729dab5e833846b0b44d2c6e1dc3e0 Mon Sep 17 00:00:00 2001
From: Ray Douglass <ray@raydouglass.com>
Date: Thu, 18 Jan 2024 14:38:04 -0500
Subject: [PATCH 064/217] DOC v24.04 Updates [skip ci]

---
 .../cuda11.8-conda/devcontainer.json          |   2 +-
 .devcontainer/cuda11.8-pip/devcontainer.json  |   2 +-
 .../cuda12.0-conda/devcontainer.json          |   2 +-
 .devcontainer/cuda12.0-pip/devcontainer.json  |   2 +-
 USAGE.md                                      |   4 +-
 .../src/cccl-dev/devcontainer-feature.json    |   2 +-
 features/src/cmake/devcontainer-feature.json  |   2 +-
 features/src/cuda/devcontainer-feature.json   | 110 +++++++++---------
 features/src/gcc/devcontainer-feature.json    |   2 +-
 .../src/gitlab-cli/devcontainer-feature.json  |   2 +-
 features/src/llvm/devcontainer-feature.json   |   2 +-
 .../src/mambaforge/devcontainer-feature.json  |   2 +-
 features/src/ninja/devcontainer-feature.json  |   2 +-
 features/src/nvhpc/devcontainer-feature.json  |   2 +-
 features/src/oneapi/devcontainer-feature.json |   2 +-
 .../devcontainer-feature.json                 |   2 +-
 .../opt/rapids-build-utils/manifest.yaml      |   4 +-
 features/src/rust/devcontainer-feature.json   |   2 +-
 .../src/sccache/devcontainer-feature.json     |   2 +-
 features/src/ucx/devcontainer-feature.json    |   2 +-
 features/src/utils/devcontainer-feature.json  |   2 +-
 21 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
index 5643f3426..558ac4f6f 100644
--- a/.devcontainer/cuda11.8-conda/devcontainer.json
+++ b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "conda",
-      "BASE": "rapidsai/devcontainers:24.02-cpp-cuda11.8-mambaforge-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.04-cpp-cuda11.8-mambaforge-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},
diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index a66f82a99..ac6f4ac53 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda11.8-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.04-cpp-llvm16-cuda11.8-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},
diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
index ae02ba519..4734a1491 100644
--- a/.devcontainer/cuda12.0-conda/devcontainer.json
+++ b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "conda",
-      "BASE": "rapidsai/devcontainers:24.02-cpp-mambaforge-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.04-cpp-mambaforge-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index d7465e4f8..27a746c1c 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -5,7 +5,7 @@
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "pip",
-      "BASE": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda12.0-ubuntu22.04"
+      "BASE": "rapidsai/devcontainers:24.04-cpp-llvm16-cuda12.0-ubuntu22.04"
     }
   },
   "hostRequirements": {"gpu": "optional"},
diff --git a/USAGE.md b/USAGE.md
index bc202075a..f1379831a 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -19,11 +19,11 @@ The features that comprise the image are noted in the image tags. If no version
 
 The pre-built images can be used as the `"image"`, or as the base of a Dockerfile in `"build"`, in `devcontainer.json`:
 
-<details><summary>devcontainer.json using pre-built image</summary><pre>{<br/>  "image": "rapidsai/devcontainers:24.02-cpp-llvm16-cuda12.0-nvhpc23.5-ubuntu22.04",<br/>  "hostRequirements": { "gpu": true },<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
+<details><summary>devcontainer.json using pre-built image</summary><pre>{<br/>  "image": "rapidsai/devcontainers:24.04-cpp-llvm16-cuda12.0-nvhpc23.5-ubuntu22.04",<br/>  "hostRequirements": { "gpu": true },<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
 
 You can also build a custom devcontainer by composing individual features:
 
-<details><summary>devcontainer.json using individual features</summary><pre>{<br/>  "image": "ubuntu:22.04",<br/>  "features": {<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake:24.02": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja:24.02": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache:24.02": {<br/>      "version": "0.5.4"<br/>    }<br/>  },<br/>  "overrideFeatureInstallOrder": [<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake",<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja",<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache"<br/>  ],<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
+<details><summary>devcontainer.json using individual features</summary><pre>{<br/>  "image": "ubuntu:22.04",<br/>  "features": {<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake:24.04": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja:24.04": {},<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache:24.04": {<br/>      "version": "0.5.4"<br/>    }<br/>  },<br/>  "overrideFeatureInstallOrder": [<br/>    "ghcr.io/rapidsai/devcontainers/features/cmake",<br/>    "ghcr.io/rapidsai/devcontainers/features/ninja",<br/>    "ghcr.io/rapidsai/devcontainers/features/sccache"<br/>  ],<br/>  "workspaceFolder": "/home/coder/${localWorkspaceFolderBasename}",<br/>  "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/${localWorkspaceFolderBasename},type=bind"<br/>}</pre></details>
 
 > **NOTE:** Feature updates published since your most recent image build will invalidate your docker image layer cache, meaning it can take the [devcontainers CLI](https://github.com/devcontainers/cli) longer to initialize containers composed from individual features.
 
diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
index c7428f3c9..b75458b46 100644
--- a/features/src/cccl-dev/devcontainer-feature.json
+++ b/features/src/cccl-dev/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA CCCL development utilities",
   "id": "cccl-dev",
-  "version": "24.2.3",
+  "version": "24.4.0",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {
diff --git a/features/src/cmake/devcontainer-feature.json b/features/src/cmake/devcontainer-feature.json
index 0612c892f..d3159dddf 100644
--- a/features/src/cmake/devcontainer-feature.json
+++ b/features/src/cmake/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CMake",
   "id": "cmake",
-  "version": "24.2.1",
+  "version": "24.4.0",
   "description": "A feature to install CMake",
   "options": {
     "version": {
diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
index 9120c96c3..e4c4bead9 100644
--- a/features/src/cuda/devcontainer-feature.json
+++ b/features/src/cuda/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CUDA Toolkit",
   "id": "cuda",
-  "version": "24.2.3",
+  "version": "24.4.0",
   "description": "A feature to install the NVIDIA CUDA Toolkit",
   "options": {
     "version": {
@@ -23,94 +23,94 @@
       "description": "Version of the CUDA Toolkit to install."
     },
     "installCompilers": {
-        "type": "boolean",
-        "default": true,
-        "description": "Install NVIDIA CUDA Compiler (nvcc)"
+      "type": "boolean",
+      "default": true,
+      "description": "Install NVIDIA CUDA Compiler (nvcc)"
     },
     "installProfilers": {
-        "type": "boolean",
-        "default": true,
-        "description": "Install NVIDIA NSight Systems Profiler (nsys)"
+      "type": "boolean",
+      "default": true,
+      "description": "Install NVIDIA NSight Systems Profiler (nsys)"
     },
     "installCTKLibraries": {
-        "type": "boolean",
-        "default": true,
-        "description": "Shortcut to install all CUDA Toolkit Libraries"
+      "type": "boolean",
+      "default": true,
+      "description": "Shortcut to install all CUDA Toolkit Libraries"
     },
     "installDevPackages": {
-        "type": "boolean",
-        "default": true,
-        "description": "Whether to install the CUDA dev packages (static libraries + headers)"
+      "type": "boolean",
+      "default": true,
+      "description": "Whether to install the CUDA dev packages (static libraries + headers)"
     },
     "installcuDNN": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA Deep Neural Network Library (cuDNN)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA Deep Neural Network Library (cuDNN)"
     },
     "installcuTensor": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA Tensor Linear Algebra Library (cuTensor)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA Tensor Linear Algebra Library (cuTensor)"
     },
     "installNCCL": {
-        "type": "boolean",
-        "default": true,
-        "description": "Install NVIDIA Collective Communications Library (NCCL)"
+      "type": "boolean",
+      "default": true,
+      "description": "Install NVIDIA Collective Communications Library (NCCL)"
     },
     "installCUDARuntime": {
-        "type": "boolean",
-        "default": true,
-        "description": "Install CUDA Runtime Library (cudart)"
+      "type": "boolean",
+      "default": true,
+      "description": "Install CUDA Runtime Library (cudart)"
     },
     "installNVRTC": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install NVIDIA Runtime Compilation Library (NVRTC)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install NVIDIA Runtime Compilation Library (NVRTC)"
     },
     "installOpenCL": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install NVIDIA CUDA OpenCL Library"
+      "type": "boolean",
+      "default": false,
+      "description": "Install NVIDIA CUDA OpenCL Library"
     },
     "installcuBLAS": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA Basic Linear Algebra Library (cuBLAS)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA Basic Linear Algebra Library (cuBLAS)"
     },
     "installcuSPARSE": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA Basic Linear Algebra for Sparse Matrices Library (cuSPARSE)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA Basic Linear Algebra for Sparse Matrices Library (cuSPARSE)"
     },
     "installcuFFT": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA Fast Fourier Transform Library (cuFFT)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA Fast Fourier Transform Library (cuFFT)"
     },
     "installcuFile": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA GPUDirect Storage API Library (cuFile)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA GPUDirect Storage API Library (cuFile)"
     },
     "installcuRAND": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA Random Number Generation Library (cuRAND)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA Random Number Generation Library (cuRAND)"
     },
     "installcuSOLVER": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install CUDA Direct Linear Solvers Library (cuSOLVER)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install CUDA Direct Linear Solvers Library (cuSOLVER)"
     },
     "installNPP": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install NVIDIA Performance Primitives (NPP)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install NVIDIA Performance Primitives (NPP)"
     },
     "installnvJPEG": {
-        "type": "boolean",
-        "default": false,
-        "description": "Install NVIDIA JPEG decoder, encoder, and transcoder library (nvJPEG)"
+      "type": "boolean",
+      "default": false,
+      "description": "Install NVIDIA JPEG decoder, encoder, and transcoder library (nvJPEG)"
     },
     "pruneStaticLibs": {
       "type": "boolean",
diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json
index 6d8ecfca4..0aa1deb53 100644
--- a/features/src/gcc/devcontainer-feature.json
+++ b/features/src/gcc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "GCC",
   "id": "gcc",
-  "version": "24.2.2",
+  "version": "24.4.0",
   "description": "A feature to install gcc",
   "options": {
     "version": {
diff --git a/features/src/gitlab-cli/devcontainer-feature.json b/features/src/gitlab-cli/devcontainer-feature.json
index c74b72c7c..9562d59f2 100644
--- a/features/src/gitlab-cli/devcontainer-feature.json
+++ b/features/src/gitlab-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "gitlab-cli",
-  "version": "24.2.1",
+  "version": "24.4.0",
   "name": "GitLab CLI",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/gitlab-cli",
   "description": "Installs the GitLab CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/features/src/llvm/devcontainer-feature.json b/features/src/llvm/devcontainer-feature.json
index 9687c599c..45fad8f49 100644
--- a/features/src/llvm/devcontainer-feature.json
+++ b/features/src/llvm/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "LLVM compilers and tools",
   "id": "llvm",
-  "version": "24.2.4",
+  "version": "24.4.0",
   "description": "A feature to install LLVM compilers and tools",
   "options": {
     "version": {
diff --git a/features/src/mambaforge/devcontainer-feature.json b/features/src/mambaforge/devcontainer-feature.json
index d35147a02..6ef848bb5 100644
--- a/features/src/mambaforge/devcontainer-feature.json
+++ b/features/src/mambaforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Mambaforge",
   "id": "mambaforge",
-  "version": "24.2.2",
+  "version": "24.4.0",
   "description": "A feature to install mambaforge",
   "options": {
     "version": {
diff --git a/features/src/ninja/devcontainer-feature.json b/features/src/ninja/devcontainer-feature.json
index 63f0835c1..0df8f2f06 100644
--- a/features/src/ninja/devcontainer-feature.json
+++ b/features/src/ninja/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Ninja build",
   "id": "ninja",
-  "version": "24.2.1",
+  "version": "24.4.0",
   "description": "A feature to install ninja-build",
   "options": {
     "version": {
diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json
index 5f68a3299..7019155e4 100644
--- a/features/src/nvhpc/devcontainer-feature.json
+++ b/features/src/nvhpc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVHPC SDK",
   "id": "nvhpc",
-  "version": "24.2.3",
+  "version": "24.4.0",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "version": {
diff --git a/features/src/oneapi/devcontainer-feature.json b/features/src/oneapi/devcontainer-feature.json
index f0df30a5b..8230fad33 100644
--- a/features/src/oneapi/devcontainer-feature.json
+++ b/features/src/oneapi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Intel oneapi toolchain",
   "id": "oneapi",
-  "version": "24.2.1",
+  "version": "24.4.0",
   "description": "A feature to install the Intel oneapi toolchain",
   "options": {
     "version": {
diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index 6adf8ce44..de3167297 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "24.2.8",
+  "version": "24.4.0",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index eb55ab57e..e1046bd05 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -1,6 +1,6 @@
 x-git-defaults: &git_defaults
     host: github
-    tag: branch-24.02
+    tag: branch-24.04
     upstream: rapidsai
 
 repos:
@@ -24,7 +24,7 @@ repos:
   git:
     repo: ucxx
     <<: *git_defaults
-    tag: branch-0.36
+    tag: branch-0.37
   cpp:
     - name: ucxx
       sub_dir: "cpp"
diff --git a/features/src/rust/devcontainer-feature.json b/features/src/rust/devcontainer-feature.json
index 085949ee5..80f27fcaf 100644
--- a/features/src/rust/devcontainer-feature.json
+++ b/features/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "rust",
-  "version": "24.2.1",
+  "version": "24.4.0",
   "name": "Rust",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/rust",
   "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/features/src/sccache/devcontainer-feature.json b/features/src/sccache/devcontainer-feature.json
index c00c6c657..cddd2ba8f 100644
--- a/features/src/sccache/devcontainer-feature.json
+++ b/features/src/sccache/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "sccache",
   "id": "sccache",
-  "version": "24.2.2",
+  "version": "24.4.0",
   "description": "A feature to install sccache",
   "options": {
     "version": {
diff --git a/features/src/ucx/devcontainer-feature.json b/features/src/ucx/devcontainer-feature.json
index 133d83efa..6915c84c4 100644
--- a/features/src/ucx/devcontainer-feature.json
+++ b/features/src/ucx/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "UCX",
   "id": "ucx",
-  "version": "24.2.1",
+  "version": "24.4.0",
   "description": "A feature to install UCX",
   "options": {
     "version": {
diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index 471a96e46..cab922aac 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.2.7",
+  "version": "24.4.0",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

From 7dd5607164d2bf7690fcfea864490b1f360a78db Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Mon, 22 Jan 2024 19:11:44 -0600
Subject: [PATCH 065/217] Remove -DNVBench_ENABLE_CUPTI=OFF. (#213)

---
 .devcontainer/build-rapids.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/build-rapids.sh b/.devcontainer/build-rapids.sh
index 1a76cb7f5..48b0530ad 100755
--- a/.devcontainer/build-rapids.sh
+++ b/.devcontainer/build-rapids.sh
@@ -47,7 +47,7 @@ build_rapids() {
     (
         echo "building cuDF";
         clean-cudf;
-        build-cudf -DBUILD_BENCHMARKS=ON -DNVBench_ENABLE_CUPTI=OFF --verbose
+        build-cudf -DBUILD_BENCHMARKS=ON --verbose
         sccache -s;
     ) 2>&1 | maybe_write_build_log cudf;
 

From 326b7da276adcbdeaf4fb7c13615174783eb8868 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 28 Jan 2024 23:07:24 -0800
Subject: [PATCH 066/217] fix typo

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index 8460226e2..2c4c44e3d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -42,7 +42,7 @@ install_${CPP_LIB}_cpp() {
     prefix="${p:-${CMAKE_INSTALL_PREFIX:-/usr/local}}";
 
     local comp;
-    for comp in "${components[@]}"; do
+    for comp in "${component[@]}"; do
         if test "all" = "${comp}"; then
             comp="";
         fi

From 21126a91d553b3350a9e4564985d81ba2362cbf3 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 00:33:05 -0800
Subject: [PATCH 067/217] fix find args

---
 features/common/utilities.sh                        | 12 ++++++++----
 features/src/cccl-dev/common/utilities.sh           | 12 ++++++++----
 features/src/cmake/common/utilities.sh              | 12 ++++++++----
 features/src/cuda/common/utilities.sh               | 12 ++++++++----
 features/src/gcc/common/utilities.sh                | 12 ++++++++----
 features/src/gitlab-cli/common/utilities.sh         | 12 ++++++++----
 features/src/llvm/common/utilities.sh               | 12 ++++++++----
 features/src/mambaforge/common/utilities.sh         | 12 ++++++++----
 features/src/ninja/common/utilities.sh              | 12 ++++++++----
 features/src/nvhpc/common/utilities.sh              | 12 ++++++++----
 features/src/oneapi/common/utilities.sh             | 12 ++++++++----
 features/src/rapids-build-utils/common/utilities.sh | 12 ++++++++----
 features/src/rust/common/utilities.sh               | 12 ++++++++----
 features/src/sccache/common/utilities.sh            | 12 ++++++++----
 features/src/ucx/common/utilities.sh                | 12 ++++++++----
 features/src/utils/common/utilities.sh              | 12 ++++++++----
 16 files changed, 128 insertions(+), 64 deletions(-)

diff --git a/features/common/utilities.sh b/features/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/common/utilities.sh
+++ b/features/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/cccl-dev/common/utilities.sh b/features/src/cccl-dev/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/cccl-dev/common/utilities.sh
+++ b/features/src/cccl-dev/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/cmake/common/utilities.sh b/features/src/cmake/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/cmake/common/utilities.sh
+++ b/features/src/cmake/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/cuda/common/utilities.sh b/features/src/cuda/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/cuda/common/utilities.sh
+++ b/features/src/cuda/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/gcc/common/utilities.sh b/features/src/gcc/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/gcc/common/utilities.sh
+++ b/features/src/gcc/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/gitlab-cli/common/utilities.sh b/features/src/gitlab-cli/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/gitlab-cli/common/utilities.sh
+++ b/features/src/gitlab-cli/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/llvm/common/utilities.sh b/features/src/llvm/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/llvm/common/utilities.sh
+++ b/features/src/llvm/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/mambaforge/common/utilities.sh b/features/src/mambaforge/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/mambaforge/common/utilities.sh
+++ b/features/src/mambaforge/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/ninja/common/utilities.sh b/features/src/ninja/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/ninja/common/utilities.sh
+++ b/features/src/ninja/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/nvhpc/common/utilities.sh b/features/src/nvhpc/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/nvhpc/common/utilities.sh
+++ b/features/src/nvhpc/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/oneapi/common/utilities.sh b/features/src/oneapi/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/oneapi/common/utilities.sh
+++ b/features/src/oneapi/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/rapids-build-utils/common/utilities.sh b/features/src/rapids-build-utils/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/rapids-build-utils/common/utilities.sh
+++ b/features/src/rapids-build-utils/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/rust/common/utilities.sh b/features/src/rust/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/rust/common/utilities.sh
+++ b/features/src/rust/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/sccache/common/utilities.sh b/features/src/sccache/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/sccache/common/utilities.sh
+++ b/features/src/sccache/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/ucx/common/utilities.sh b/features/src/ucx/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/ucx/common/utilities.sh
+++ b/features/src/ucx/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";
diff --git a/features/src/utils/common/utilities.sh b/features/src/utils/common/utilities.sh
index 73f4d2c19..88991f003 100644
--- a/features/src/utils/common/utilities.sh
+++ b/features/src/utils/common/utilities.sh
@@ -26,7 +26,8 @@ export -f check_packages;
 
 for_each_user_bashrc() {
     # Update all bashrc files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -34,7 +35,8 @@ export -f for_each_user_bashrc;
 
 for_each_user_profile() {
     # Update all .profile files
-    find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .profile \
+    # shellcheck disable=SC2086
+    find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .profile \
   | sort | uniq | xargs -r -d'\n' -n1 bash -c "${@}";
 }
 
@@ -42,7 +44,8 @@ export -f for_each_user_profile;
 
 append_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Appending to $bashrc...";
             echo -e "$1" >> "$bashrc";
@@ -54,7 +57,8 @@ export -f append_to_all_bashrcs;
 
 prepend_to_all_bashrcs() {
     # Update all bashrc files
-    for bashrc in $(find / /etc /home "${_REMOTE_USER_HOME}" "${_CONTAINER_USER_HOME}" -maxdepth 2 -type f -name .bashrc | sort | uniq); do
+    # shellcheck disable=SC2086
+    for bashrc in $(find / /etc /home ${_REMOTE_USER_HOME} ${_CONTAINER_USER_HOME} -maxdepth 2 -type f -name .bashrc | sort | uniq); do
         if [[ "$(cat "$bashrc")" != *"$1"* ]]; then
             echo "Prepending to $bashrc...";
             echo -e "$1\n$(cat "$bashrc")" > "$bashrc";

From 404e9e31e1fae086d75b2516b90eb195dd007b26 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 00:55:56 -0800
Subject: [PATCH 068/217] fixes for bash v4.4.20 (Ubuntu 18.04)

---
 features/src/rapids-build-utils/install.sh         | 14 +++++++++++---
 features/src/utils/install.sh                      |  4 ++--
 .../bin/bash/generate-bash-completion.sh           |  6 +++---
 .../src/utils/opt/devcontainer/bin/parse-args.sh   | 14 +++++++++-----
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index e38a6a784..15de5a503 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -e
+set -ex
 
 # Ensure we're in this feature's directory during build
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
@@ -22,9 +22,15 @@ if ! type yq >/dev/null 2>&1; then
         | tar -C /usr/bin -zf - -x ./${YQ_BINARY} --transform="s/${YQ_BINARY}/yq/";
 fi
 
+source /etc/lsb-release;
+
+if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then
+  BREAK_PACKAGES="--break-system-packages";
+fi
+
 # Install the rapids dependency file generator and conda-merge
 if type python >/dev/null 2>&1; then
-    python -m pip install rapids-dependency-file-generator conda-merge toml;
+    python -m pip install $BREAK_PACKAGES rapids-dependency-file-generator conda-merge toml;
 fi
 
 # Install RAPIDS build utility scripts to /opt/
@@ -38,7 +44,9 @@ install_utility() {
     update-alternatives --install /usr/bin/${cmd} ${cmd} /opt/rapids-build-utils/bin/${src} 0;
 
     # Install bash_completion script
-    devcontainer-utils-generate-bash-completion --command "${cmd}" --out-dir /etc/bash_completion.d;
+    if type devcontainer-utils-generate-bash-completion >/dev/null 2>&1; then
+        devcontainer-utils-generate-bash-completion --command "${cmd}" --out-dir /etc/bash_completion.d;
+    fi
 }
 
 install_utility update-content-command;
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index eff9ca138..159bd7650 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -e
+set -ex
 
 # Ensure we're in this feature's directory during build
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
@@ -22,7 +22,7 @@ check_packages      \
 source /etc/lsb-release;
 
 if [[ ! "23.04" > "${DISTRIB_RELEASE}" ]]; then
-  BREAK_PACKAGES="--break-system-packages"
+  BREAK_PACKAGES="--break-system-packages";
 fi
 
 # upgrade pip
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index d0abf8bae..6bf9c7cde 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -29,9 +29,9 @@ generate_bash_completion() {
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    local -r command="${c:-${command:?-c|--command is required}}";
-    local -r out_dir="$(realpath -m "${o:-${out_dir:-"${HOME}/.bash_completion.d"}}")";
-    local -r template="${t:-${template:-${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}}}";
+    command="${c:?-c|--command is required}";
+    out_dir="$(realpath -m "${o:-"${HOME}/.bash_completion.d"}")";
+    template="${t:-${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}}";
 
     if test -f "${template}"; then
         mkdir -p "${out_dir}";
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 8c1cbad11..f0d6a37b3 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -278,15 +278,19 @@ parse_args() {
         echo >&2;
         echo "exit 0";
     else
-        echo "declare -A ARGS; ARGS=(${args[*]@K})";
-        echo "declare -a OPTS; OPTS=(${opts[*]@Q})";
-        echo "declare -a REST; REST=(${rest[*]@Q})";
+        echo "declare -A ARGS=(";
+        for key in "${!args[@]}"; do
+            echo "[${key@Q}]=${args["${key}"]@Q}";
+        done
+        echo ")";
+        echo "declare -a OPTS=(${opts[*]@Q})";
+        echo "declare -a REST=(${rest[*]@Q})";
 
         for key in "${!args[@]}"; do
             if test "${typs["${key}"]}" = bool; then
-                echo "declare ${key//-/_}; ${key//-/_}=${args["${key}"]}";
+                echo "declare ${key//-/_}=${args["${key}"]}";
             else
-                echo "declare -a ${key//-/_}; ${key//-/_}=(${args["${key}"]})";
+                echo "declare -a ${key//-/_}=(${args["${key}"]})";
             fi
             local -a aliases="(${alias_map["${key}"]})";
             for alias in "${aliases[@]}"; do

From 86980f27163f1d0b5c61b65e04ca6dd05ddfd9f6 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 01:04:19 -0800
Subject: [PATCH 069/217] don't do local -r in loops

---
 .../opt/rapids-build-utils/bin/pull-repositories.sh           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 3154509b5..c9df1626c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -45,11 +45,11 @@ pull_repositories() {
         git -C ~/${!repo_path} fetch --no-tags upstream;
         git -C ~/${!repo_path} fetch --no-tags origin;
 
-        local -r branch_name="$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD)";
+        local branch_name="$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD)";
 
         while ! git -C ~/${!repo_path} branch -r | grep -q "upstream/${branch_name}"; do
 
-            local -r upstream_info="$(git -C ~/${!repo_path} remote -v show | grep upstream | head -n1)";
+            local upstream_info="$(git -C ~/${!repo_path} remote -v show | grep upstream | head -n1)";
 
             read -rp "
 ############################################################

From 95b6673aaf338dccc7aa9879adc311fa378e03ac Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 01:13:49 -0800
Subject: [PATCH 070/217] fix pull-repositories

---
 .../opt/rapids-build-utils/bin/pull-repositories.sh             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index c9df1626c..e30e24dbe 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -47,7 +47,7 @@ pull_repositories() {
 
         local branch_name="$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD)";
 
-        while ! git -C ~/${!repo_path} branch -r | grep -q "upstream/${branch_name}"; do
+        while [[ -z "$(git -C ~/${!repo_path} branch -r | grep upstream/${branch_name})" ]]; do
 
             local upstream_info="$(git -C ~/${!repo_path} remote -v show | grep upstream | head -n1)";
 

From 47b61a4a5c2c74e097db7ab495e19091e0b2c97e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 01:18:34 -0800
Subject: [PATCH 071/217] don't do -r in loops

---
 .../src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh | 7 ++++---
 features/src/utils/opt/devcontainer/bin/vault/s3/init.sh   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
index a03251aa9..309baed60 100755
--- a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
+++ b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
@@ -14,10 +14,11 @@ init_ssh_deploy_keys() {
     local re="(ssh:\/\/|https:\/\/)?(git@)?(.*\.com)[:\/](.*)";
     local line;
 
+    # shellcheck disable=SC2155
     ssh-add -L | while read -r line; do
-        local -r key="$(cut -d' ' -f2 <<< "${line}")";
-        local -r url="$(cut -d' ' -f3 <<< "${line}")";
-        local -r sha="$(md5sum --tag <<< "${key}" | cut -d' ' -f4)";
+        local key="$(cut -d' ' -f2 <<< "${line}")";
+        local url="$(cut -d' ' -f3 <<< "${line}")";
+        local sha="$(md5sum --tag <<< "${key}" | cut -d' ' -f4)";
 
         if [[ ${url} =~ ${re} ]]; then
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index a02ac0e66..5103d0cfa 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -16,7 +16,7 @@ init_vault_s3_creds() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    if type sccache >/dev/null; then
+    if type sccache >/dev/null 2>&1; then
         if test -n "${SCCACHE_BUCKET:-}"; then
             if grep -qE "^$" <<< "${AWS_ACCESS_KEY_ID:-}"     \
             && grep -qE "^$" <<< "${AWS_SECRET_ACCESS_KEY:-}" ; then

From 7ef30d3920ebb697f0fc86f11138782b068aad61 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 01:24:45 -0800
Subject: [PATCH 072/217] remove set -x

---
 features/src/rapids-build-utils/install.sh | 2 +-
 features/src/utils/install.sh              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 15de5a503..5438b9f0a 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -ex
+set -e
 
 # Ensure we're in this feature's directory during build
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 159bd7650..d83179622 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-set -ex
+set -e
 
 # Ensure we're in this feature's directory during build
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";

From ae797dcc2635e7603cde05a3a295fb6b1a8996c0 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:46:30 -0800
Subject: [PATCH 073/217] temporarily allow unbound variables while activating
 the conda env (#216)

---
 features/src/mambaforge/.bashrc                   | 12 ++++++++++--
 features/src/mambaforge/devcontainer-feature.json |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/features/src/mambaforge/.bashrc b/features/src/mambaforge/.bashrc
index 1d0543804..7ef4b92be 100644
--- a/features/src/mambaforge/.bashrc
+++ b/features/src/mambaforge/.bashrc
@@ -5,8 +5,16 @@ for default_conda_env_name in ${DEFAULT_CONDA_ENV:-} ${CONDA_DEFAULT_ENV:-} base
     if grep -qF "(${default_conda_env_name})" <<< "${CONDA_PROMPT_MODIFIER:-}"; then
         break;
     fi
-    conda activate "$default_conda_env_name" 2>/dev/null && break || continue;
-done;
+    # Temporarily allow unbound variables for conda activation.
+    oldstate="$(shopt -po; shopt -p)"; [[ -o errexit ]] && oldstate="${oldstate}; set -e"; set +u;
+    if conda activate "${default_conda_env_name}" 2>/dev/null; then
+        { set +vx; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
+        break;
+    else
+        { set +vx; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
+        continue;
+    fi
+done
 
 if [ -n "${CONDA_EXE:-}" ]; then
     conda_bin_paths="$(dirname "$(dirname "${CONDA_EXE}")")/condabin";
diff --git a/features/src/mambaforge/devcontainer-feature.json b/features/src/mambaforge/devcontainer-feature.json
index 6ef848bb5..5e921ed0e 100644
--- a/features/src/mambaforge/devcontainer-feature.json
+++ b/features/src/mambaforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Mambaforge",
   "id": "mambaforge",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install mambaforge",
   "options": {
     "version": {

From 6db286225e905950dc9396b4fc65c065058f255e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 10:50:10 -0800
Subject: [PATCH 074/217] bump mambaforge feature version

---
 features/src/mambaforge/devcontainer-feature.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/mambaforge/devcontainer-feature.json b/features/src/mambaforge/devcontainer-feature.json
index 5e921ed0e..77013cb00 100644
--- a/features/src/mambaforge/devcontainer-feature.json
+++ b/features/src/mambaforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Mambaforge",
   "id": "mambaforge",
-  "version": "24.4.1",
+  "version": "24.4.2",
   "description": "A feature to install mambaforge",
   "options": {
     "version": {

From 0b0c846b96d3346cf20ff57082d152fde3b8bf7d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 10:56:59 -0800
Subject: [PATCH 075/217] fix shellcheck lint

---
 features/common/utilities.sh                  |  2 +-
 features/src/cccl-dev/common/utilities.sh     |  2 +-
 features/src/cmake/common/utilities.sh        |  2 +-
 features/src/cuda/common/utilities.sh         |  2 +-
 features/src/gcc/common/utilities.sh          |  2 +-
 features/src/gitlab-cli/common/utilities.sh   |  2 +-
 features/src/llvm/common/utilities.sh         |  2 +-
 features/src/mambaforge/common/utilities.sh   |  2 +-
 features/src/mambaforge/install.sh            | 20 ++++++++++++-------
 features/src/ninja/common/utilities.sh        |  2 +-
 features/src/nvhpc/common/utilities.sh        |  2 +-
 features/src/oneapi/common/utilities.sh       |  2 +-
 .../rapids-build-utils/common/utilities.sh    |  2 +-
 features/src/rust/common/utilities.sh         |  2 +-
 features/src/sccache/common/utilities.sh      |  2 +-
 features/src/ucx/common/utilities.sh          |  2 +-
 features/src/utils/common/utilities.sh        |  2 +-
 17 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/features/common/utilities.sh b/features/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/common/utilities.sh
+++ b/features/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/cccl-dev/common/utilities.sh b/features/src/cccl-dev/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/cccl-dev/common/utilities.sh
+++ b/features/src/cccl-dev/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/cmake/common/utilities.sh b/features/src/cmake/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/cmake/common/utilities.sh
+++ b/features/src/cmake/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/cuda/common/utilities.sh b/features/src/cuda/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/cuda/common/utilities.sh
+++ b/features/src/cuda/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/gcc/common/utilities.sh b/features/src/gcc/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/gcc/common/utilities.sh
+++ b/features/src/gcc/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/gitlab-cli/common/utilities.sh b/features/src/gitlab-cli/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/gitlab-cli/common/utilities.sh
+++ b/features/src/gitlab-cli/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/llvm/common/utilities.sh b/features/src/llvm/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/llvm/common/utilities.sh
+++ b/features/src/llvm/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/mambaforge/common/utilities.sh b/features/src/mambaforge/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/mambaforge/common/utilities.sh
+++ b/features/src/mambaforge/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/mambaforge/install.sh b/features/src/mambaforge/install.sh
index c3c622601..0b6540798 100644
--- a/features/src/mambaforge/install.sh
+++ b/features/src/mambaforge/install.sh
@@ -7,6 +7,7 @@ MAMBAFORGE_VERSION="${VERSION:-latest}";
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
 
 # install global/common scripts
+# shellcheck disable=SC1091
 . ./common/install.sh;
 
 check_packages jq git wget bzip2 ca-certificates bash-completion;
@@ -18,7 +19,7 @@ if [[ "$MAMBAFORGE_VERSION" == latest ]]; then
 fi
 
 wget --no-hsts -q -O /tmp/miniforge.sh \
-    https://github.com/conda-forge/miniforge/releases/download/${MAMBAFORGE_VERSION}/Mambaforge-${MAMBAFORGE_VERSION}-Linux-$(uname -p).sh;
+    "https://github.com/conda-forge/miniforge/releases/download/${MAMBAFORGE_VERSION}/Mambaforge-${MAMBAFORGE_VERSION}-Linux-$(uname -p).sh";
 
 echo "Installing Mambaforge...";
 
@@ -34,26 +35,29 @@ find /opt/conda -follow -type f -name '*.pyc' -delete;
 conda clean --force-pkgs-dirs --all --yes;
 
 # Activate conda in /etc/bash.bashrc
-append_to_etc_bashrc "
+append_to_etc_bashrc "$(cat<< EOF
 for x in "conda" "mamba"; do
     if ! type \$x 2>&1 | grep -q function; then . /opt/conda/etc/profile.d/\$x.sh; fi;
 done
 $(cat .bashrc)
-";
+EOF
+)";
 # Activate conda in ~/.bashrc
-append_to_all_bashrcs "
+append_to_all_bashrcs "$(cat<< EOF
 for x in "conda" "mamba"; do
     if ! type \$x 2>&1 | grep -q function; then . /opt/conda/etc/profile.d/\$x.sh; fi;
 done
 $(cat .bashrc)
-";
+EOF
+)";
 # export envvars in /etc/profile.d
-ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-conda.sh;
-ln -s /opt/conda/etc/profile.d/mamba.sh /etc/profile.d/$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-mamba.sh;
+ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-conda.sh;
+ln -s /opt/conda/etc/profile.d/mamba.sh /etc/profile.d/$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-mamba.sh;
 add_etc_profile_d_script mambaforge "$(cat .bashrc)";
 
 # Update the devcontainers/features/common-utils __bash_prompt fn
 # to insert ${CONDA_PROMPT_MODIFIER} into the dev container's PS1
+# shellcheck disable=SC2016
 for_each_user_bashrc '
 if [[ "$(grep -qE "^__bash_prompt\(\) \{$" "$0"; echo $?)" == 0 ]]; then
     sed -i -re "s@PS1=\"(\\\$\{userpart\} )@PS1=\"\${CONDA_PROMPT_MODIFIER:-}\1@g" "$0";
@@ -66,6 +70,7 @@ fi
 #
 # We need a stable absolute path for the dev container's Python extension
 # settings (defined in devcontainer-feature.json).
+# shellcheck disable=SC2016
 sed -i \
     's/\(shell.posix "$@")\)/\1 \&\& sudo ln -nsf "\\${CONDA_PREFIX:-\/opt\/conda}" \/tmp\/.current-conda-env/' \
     /opt/conda/etc/profile.d/conda.sh;
@@ -73,6 +78,7 @@ sed -i \
 ln -s /opt/conda /tmp/.current-conda-env;
 
 # Ensure the `~/.conda` dir exists for each user
+# shellcheck disable=SC2016
 for dir in $(for_each_user_bashrc 'echo "$(dirname "$(realpath -m "$0")")"'); do
     mkdir -p "${dir}"/.conda/{envs,pkgs};
 done
diff --git a/features/src/ninja/common/utilities.sh b/features/src/ninja/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/ninja/common/utilities.sh
+++ b/features/src/ninja/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/nvhpc/common/utilities.sh b/features/src/nvhpc/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/nvhpc/common/utilities.sh
+++ b/features/src/nvhpc/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/oneapi/common/utilities.sh b/features/src/oneapi/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/oneapi/common/utilities.sh
+++ b/features/src/oneapi/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/rapids-build-utils/common/utilities.sh b/features/src/rapids-build-utils/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/rapids-build-utils/common/utilities.sh
+++ b/features/src/rapids-build-utils/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/rust/common/utilities.sh b/features/src/rust/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/rust/common/utilities.sh
+++ b/features/src/rust/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/sccache/common/utilities.sh b/features/src/sccache/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/sccache/common/utilities.sh
+++ b/features/src/sccache/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/ucx/common/utilities.sh b/features/src/ucx/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/ucx/common/utilities.sh
+++ b/features/src/ucx/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/utils/common/utilities.sh b/features/src/utils/common/utilities.sh
index 88991f003..3599982a3 100644
--- a/features/src/utils/common/utilities.sh
+++ b/features/src/utils/common/utilities.sh
@@ -123,7 +123,7 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
+    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }

From 5a3b692a17f180d7028b13894ec49188a51121e5 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 11:22:17 -0800
Subject: [PATCH 076/217] use conda env create in both places

---
 .../opt/rapids-build-utils/bin/make-conda-env.sh              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 5ed0a413b..fb8531339 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -59,7 +59,7 @@ make_conda_env() {
             cat "${new_env_path}";
             echo "";
 
-            mamba env create -n "${env_name}" -f "${new_env_path}";
+            conda env create -n "${env_name}" -f "${new_env_path}" --solver=libmamba;
         # If the conda env does exist but it's different from the generated one,
         # print the diff between the envs and update it
         elif ! diff -BNqw "${old_env_path}" "${new_env_path}" >/dev/null 2>&1; then
@@ -75,7 +75,7 @@ make_conda_env() {
 
             # Update the current conda env + prune libs that were removed
             # Use conda instead of mamba due to https://github.com/mamba-org/mamba/issues/3059
-            conda env update -n "${env_name}" -f "${new_env_path}" --prune --solver=libmamba
+            conda env update -n "${env_name}" -f "${new_env_path}" --prune --solver=libmamba;
         fi
 
         cp -a "${new_env_path}" "${old_env_path}";

From 1fc47b0990d13442213d64b1a85b4a932da97bd4 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 29 Jan 2024 23:25:26 -0800
Subject: [PATCH 077/217] don't set -E

---
 .../opt/rapids-build-utils/bin/checkout-same-branch.sh    | 2 +-
 .../opt/rapids-build-utils/bin/generate-scripts.sh        | 8 ++++----
 .../rapids-build-utils/bin/get-num-archs-jobs-and-load.sh | 2 +-
 .../opt/rapids-build-utils/bin/list-repos.sh              | 2 +-
 .../opt/rapids-build-utils/bin/make-conda-dependencies.sh | 2 +-
 .../opt/rapids-build-utils/bin/make-conda-env.sh          | 2 +-
 .../opt/rapids-build-utils/bin/make-pip-dependencies.sh   | 2 +-
 .../opt/rapids-build-utils/bin/make-pip-env.sh            | 2 +-
 .../opt/rapids-build-utils/bin/make-vscode-workspace.sh   | 2 +-
 .../opt/rapids-build-utils/bin/parse-cmake-args.sh        | 2 +-
 .../rapids-build-utils/bin/parse-cmake-var-from-args.sh   | 2 +-
 .../rapids-build-utils/bin/parse-cmake-vars-from-args.sh  | 4 ++--
 .../opt/rapids-build-utils/bin/parse-valid-args.sh        | 2 +-
 .../opt/rapids-build-utils/bin/pull-repositories.sh       | 2 +-
 .../opt/rapids-build-utils/bin/push-repositories.sh       | 2 +-
 .../opt/rapids-build-utils/bin/python-conda-pkg-names.sh  | 2 +-
 .../opt/rapids-build-utils/bin/python-pkg-names.sh        | 2 +-
 .../opt/rapids-build-utils/bin/python-pkg-roots.sh        | 2 +-
 .../opt/rapids-build-utils/bin/query-manifest.sh          | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh   | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.tmpl.sh           | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh   | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh | 2 +-
 .../bin/tmpl/python.build.editable.tmpl.sh                | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh  | 2 +-
 .../bin/tmpl/python.build.wheel.tmpl.sh                   | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh  | 2 +-
 .../rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh  | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh    | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh    | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh    | 2 +-
 .../rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh    | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh    | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh  | 2 +-
 .../rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh    | 2 +-
 .../opt/devcontainer/bin/bash/generate-bash-completion.sh | 2 +-
 features/src/utils/opt/devcontainer/bin/git/init.sh       | 2 +-
 features/src/utils/opt/devcontainer/bin/git/repo/clone.sh | 2 +-
 .../src/utils/opt/devcontainer/bin/github/cli/init.sh     | 2 +-
 .../src/utils/opt/devcontainer/bin/github/repo/clone.sh   | 2 +-
 .../src/utils/opt/devcontainer/bin/gitlab/cli/init.sh     | 2 +-
 .../src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh   | 2 +-
 features/src/utils/opt/devcontainer/bin/parse-args.sh     | 2 +-
 .../utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh    | 2 +-
 .../src/utils/opt/devcontainer/bin/vault/auth/github.sh   | 2 +-
 .../utils/opt/devcontainer/bin/vault/s3/creds/generate.sh | 2 +-
 .../utils/opt/devcontainer/bin/vault/s3/creds/persist.sh  | 2 +-
 .../opt/devcontainer/bin/vault/s3/creds/propagate.sh      | 2 +-
 .../utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh | 2 +-
 .../src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh | 2 +-
 features/src/utils/opt/devcontainer/bin/vault/s3/init.sh  | 2 +-
 features/test/utils/ubuntu18.04.sh                        | 2 +-
 features/test/utils/ubuntu20.04.sh                        | 2 +-
 features/test/utils/ubuntu22.04.sh                        | 2 +-
 scripts/run.sh                                            | 6 +++---
 65 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 753483b99..c222a23f3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -21,7 +21,7 @@
 
 checkout_same_branch() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 747071aa4..259f7173f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -8,7 +8,7 @@ TMP_SCRIPT_DIR="${TMP_SCRIPT_DIR:-/tmp/rapids-build-utils}";
 
 clean_completions() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
@@ -33,7 +33,7 @@ clean_completions() {
 
 generate_completions() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
@@ -63,7 +63,7 @@ generate_completions() {
 
 clean_scripts() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
     mkdir -p "${TMP_SCRIPT_DIR}";
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
     sudo rm -f -- \
@@ -196,7 +196,7 @@ generate_python_scripts() {
 
 generate_scripts() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 17bc85b19..47f0aee11 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -25,7 +25,7 @@
 
 get_num_archs_jobs_and_load() {
     local -;
-    set -Eeuo pipefail
+    set -euo pipefail
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 8b81fbbe8..1b4194a7c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -18,7 +18,7 @@
 
 list_repos() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index d3c18ae75..55f03dc76 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -27,7 +27,7 @@ generate_env_yaml() {
 
 make_conda_dependencies() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index fb8531339..b71f616a0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -20,7 +20,7 @@
 
 make_conda_env() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 4a6f50e73..cbfa7eb79 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -29,7 +29,7 @@ generate_requirements() {
 
 make_pip_dependencies() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index f223d0695..85e920018 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -22,7 +22,7 @@
 
 make_pip_env() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
index d9e788fc7..f3befbf87 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
@@ -73,7 +73,7 @@ EOF
 
 make_vscode_workspace() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
index 2e30ed0ea..a9ed295b9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
@@ -2,7 +2,7 @@
 
 parse_cmake_args() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     local ARG="";
     local args=(-GNinja);
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
index ca10995d9..feab3a8d1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
@@ -2,7 +2,7 @@
 
 parse_cmake_var_from_args() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     eval "$(                                       \
         rapids-parse-cmake-vars-from-args "${@:2}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
index 3c3dfc866..ac171e701 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
@@ -2,7 +2,7 @@
 
 join_with_delimiter() {
     local -;
-    set -Eeuo pipefail
+    set -euo pipefail
     local IFS='' delim=${1:-};
     shift;
     echo -n "${1:-}";
@@ -12,7 +12,7 @@ join_with_delimiter() {
 
 parse_cmake_vars_from_args() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2046
     echo -e "$(join_with_delimiter "\n" $(rapids-parse-cmake-args "$@"))" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
index 8dbd8ea36..6cf9445da 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
@@ -2,7 +2,7 @@
 
 parse_valid_args() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     local -r cmd="$*";
     local -r hash="$(echo "$cmd" | tr -d'[:space:]')";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index e30e24dbe..95229d487 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -18,7 +18,7 @@
 
 pull_repositories() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index 91e5c507b..adb7deb3b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -18,7 +18,7 @@
 
 push_repositories() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index b3d2e02de..7fedbae69 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -21,7 +21,7 @@
 
 python_conda_pkg_names() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index e8881498b..6e72c7638 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -18,7 +18,7 @@
 
 python_pkg_names() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index 4cd7d512b..dcc9ccab3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -18,7 +18,7 @@
 
 python_pkg_roots() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index 67c49f22f..1d9660ffe 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -14,7 +14,7 @@
 
 query_manifest() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
index 2a2981297..a92fe965a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -27,7 +27,7 @@
 
 build_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index a1d9c076f..fbf969feb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -15,7 +15,7 @@
 
 clean_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 3f288e142..c2d3d19cb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -20,7 +20,7 @@
 
 clone_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
index 6bd8589ca..435af21f3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
@@ -25,7 +25,7 @@
 
 configure_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index ca59efca3..07ab9be60 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -17,7 +17,7 @@
 
 cpack_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
index 36b2d2a8b..a8f29d649 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
@@ -23,7 +23,7 @@
 
 install_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
index af123c9d7..c6580f48d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
@@ -13,7 +13,7 @@
 
 ${SCRIPT}_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
index 2a7d3258b..7b62b10fa 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
@@ -13,7 +13,7 @@
 
 uninstall_all() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index 7d9b1e5d7..cc420364f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -24,7 +24,7 @@
 
 build_${CPP_LIB}_cpp() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index b24db7f8f..f0cad1087 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -10,7 +10,7 @@
 
 clean_${CPP_LIB}_cpp() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 894c583eb..aef45caaf 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -24,7 +24,7 @@
 
 configure_${CPP_LIB}_cpp() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index adf678b65..04c87fca8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -15,7 +15,7 @@
 
 cpack_${CPP_LIB}_cpp() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index 2c4c44e3d..5afec4199 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -21,7 +21,7 @@
 
 install_${CPP_LIB}_cpp() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 253943c8b..234278a47 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -11,7 +11,7 @@
 
 uninstall_${CPP_LIB}_cpp() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index 8b4b8936a..c1c2e6c8d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -23,7 +23,7 @@
 
 build_${PY_LIB}_python_editable() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
index 9a5b3c484..f17b23511 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
@@ -15,7 +15,7 @@
 
 build_${PY_LIB}_python() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 7dda23ffb..a7c599fba 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -45,7 +45,7 @@
 
 build_${PY_LIB}_python_wheel() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index 894957f15..78fc243b7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -10,7 +10,7 @@
 
 clean_${PY_LIB}_python() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index dc4e318f8..db2805073 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -11,7 +11,7 @@
 
 uninstall_${PY_LIB}_python() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
index f9c2168b8..2162b6099 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
@@ -25,7 +25,7 @@
 
 build_${NAME}() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
index 59c6af143..65477604f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
@@ -10,7 +10,7 @@
 
 clean_${NAME}() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 011019698..cd9aee44c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -26,7 +26,7 @@
 
 clone_${NAME}() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
index 92f08e29b..850df8078 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
@@ -25,7 +25,7 @@
 
 configure_${NAME}() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
index 56decedb6..6aa110390 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
@@ -15,7 +15,7 @@
 
 cpack_${NAME}() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
index c9d8c9c9d..23e040106 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
@@ -21,7 +21,7 @@
 
 install_${NAME}() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index fc8fd95aa..075e3f70d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -11,7 +11,7 @@
 
 uninstall_${NAME}() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${rapids_build_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index 6bf9c7cde..b8cab4236 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -18,7 +18,7 @@
 
 generate_bash_completion() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/git/init.sh b/features/src/utils/opt/devcontainer/bin/git/init.sh
index 3d65e6655..1b91aa9b0 100755
--- a/features/src/utils/opt/devcontainer/bin/git/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/init.sh
@@ -2,7 +2,7 @@
 
 init_git_cli_config() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 992d376bc..6893e372d 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -28,7 +28,7 @@
 
 clone_git_repo() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/github/cli/init.sh b/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
index ae7a3ef5d..a64acf839 100755
--- a/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/cli/init.sh
@@ -2,7 +2,7 @@
 
 init_github_cli() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     if ! type gh > /dev/null 2>&1; then
         export GITHUB_USER="";
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 3b7a3c133..9300e565c 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -82,7 +82,7 @@ ________EOF
 
 clone_github_repo() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
index 1b99b34ce..731887202 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/cli/init.sh
@@ -14,7 +14,7 @@ _remove_warning_from_bashrc() {
 
 init_gitlab_cli() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     if ! type glab > /dev/null 2>&1; then
         export GITLAB_USER="";
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index ab9145cf2..f628af889 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -106,7 +106,7 @@ get_user_fork_name() {
 
 clone_gitlab_repo() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
         -j,--parallel
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index f0d6a37b3..77991d2aa 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -5,7 +5,7 @@
 
 parse_args() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
index 309baed60..30f0fd57d 100755
--- a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
+++ b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
@@ -2,7 +2,7 @@
 
 init_ssh_deploy_keys() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
index 2e171fc56..ff2491ac1 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
@@ -3,7 +3,7 @@
 
 get_vault_token() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index a90e947de..9c6ccf5f8 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -4,7 +4,7 @@
 
 generate_s3_creds() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index 0dcc51d56..33f96034b 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -59,7 +59,7 @@ reset_envvar() {
 
 persist_s3_creds() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
index 139b56018..743b99f0e 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
@@ -2,7 +2,7 @@
 
 ensure_s3_creds_have_propagated() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index d070cb7f2..ed6f0a951 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -2,7 +2,7 @@
 
 schedule_s3_creds_refresh() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
index a9046e16a..88264fbdf 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -4,7 +4,7 @@
 
 test_aws_creds() {
     local -;
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index 5103d0cfa..b08df2b9c 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -7,7 +7,7 @@ s3_cred() {
 init_vault_s3_creds() {
 
     local -
-    set -Eeuo pipefail;
+    set -euo pipefail;
 
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
diff --git a/features/test/utils/ubuntu18.04.sh b/features/test/utils/ubuntu18.04.sh
index f03019467..bb4f96c41 100644
--- a/features/test/utils/ubuntu18.04.sh
+++ b/features/test/utils/ubuntu18.04.sh
@@ -7,7 +7,7 @@
 #     --base-image ubuntu:22.04 .'
 # ```
 
-set -Eeuo pipefail
+set -euo pipefail
 
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
diff --git a/features/test/utils/ubuntu20.04.sh b/features/test/utils/ubuntu20.04.sh
index f03019467..bb4f96c41 100644
--- a/features/test/utils/ubuntu20.04.sh
+++ b/features/test/utils/ubuntu20.04.sh
@@ -7,7 +7,7 @@
 #     --base-image ubuntu:22.04 .'
 # ```
 
-set -Eeuo pipefail
+set -euo pipefail
 
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
diff --git a/features/test/utils/ubuntu22.04.sh b/features/test/utils/ubuntu22.04.sh
index f03019467..bb4f96c41 100644
--- a/features/test/utils/ubuntu22.04.sh
+++ b/features/test/utils/ubuntu22.04.sh
@@ -7,7 +7,7 @@
 #     --base-image ubuntu:22.04 .'
 # ```
 
-set -Eeuo pipefail
+set -euo pipefail
 
 # Optional: Import test library bundled with the devcontainer CLI
 source dev-container-features-test-lib
diff --git a/scripts/run.sh b/scripts/run.sh
index 53a295840..a5a4ce026 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -1,8 +1,8 @@
 #! /usr/bin/env bash
 
 run_devcontainer() {
-
-    set -Eeuo pipefail;
+    local -
+    set -euo pipefail;
 
     # PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
 
@@ -95,4 +95,4 @@ ________
         ${cmds:-/bin/bash};
 }
 
-(run_devcontainer "$@");
+run_devcontainer "$@";

From e20c87d4f611dd821e53ef8b9fe0b4c659be3fb8 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 30 Jan 2024 00:22:49 -0800
Subject: [PATCH 078/217] more verbose output

---
 .../opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh        | 5 +++--
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh        | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index fbf969feb..d1acd0952 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -8,7 +8,8 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
 #
 # Options that require values:
 #  -j,--parallel <num>          Clone <num> repos in parallel
@@ -30,7 +31,7 @@ clean_all() {
 
     echo "${NAMES}"                     \
   | tr '[:space:]' '\0'                 \
-  | xargs -r -0 -P${n_jobs} -I% bash -c "
+  | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
     if type clean-% >/dev/null 2>&1; then
         clean-% $* || exit 255;
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index c2d3d19cb..b28e5733a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -7,6 +7,7 @@
 #
 # Boolean options:
 #  -h,--help,--usage            print this text
+#  -v,--verbose                 verbose output
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
 #  --no-update-env              don't update the Python env with the repo's dependencies after cloning
@@ -44,7 +45,7 @@ clone_all() {
 
     echo "${NAMES}"                     \
   | tr '[:space:]' '\0'                 \
-  | xargs -r -0 -P${n_jobs} -I% bash -c "
+  | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
     if type clone-% >/dev/null 2>&1; then
         clone-% -j ${n_modules} --no-update-env ${OPTS[*]} || exit 255;
     fi

From ad0b7092c8d5aacf40a0f7fd4a8bff598a5c0cdf Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 01:04:48 -0800
Subject: [PATCH 079/217] add rapids-post-attach-entrypoint

---
 features/src/rapids-build-utils/install.sh                | 1 +
 .../bin/post-attach-command-entrypoint.sh                 | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 5438b9f0a..b617b418f 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -52,6 +52,7 @@ install_utility() {
 install_utility update-content-command;
 install_utility post-start-command;
 install_utility post-attach-command;
+install_utility post-attach-command-entrypoint;
 
 install_utility checkout-same-branch;
 install_utility pull-repositories;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh
new file mode 100755
index 000000000..adfde43ba
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+export SKIP_RAPIDS_BUILD_UTILS_POST_ATTACH_COMMAND=;
+
+# shellcheck disable=SC1091
+. rapids-post-attach-command;
+
+exec "$@";

From 8c1e80cbf3f4721b191f006cef6134327b01ca43 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 01:06:39 -0800
Subject: [PATCH 080/217] make the latest symlink local instead of absolute

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index aef45caaf..accae1806 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -55,7 +55,10 @@ configure_${CPP_LIB}_cpp() {
     fi
 
     mkdir -p ${binary_dir};
-    ln -sfn ${binary_dir} ${source_dir}/build/latest;
+    (
+        cd ${source_dir}/build;
+        ln -sfn ${build_type} latest;
+    );
 
     local cmake_args=(-GNinja);
     cmake_args+=(-S ${source_dir});

From 9a55de9a2457a71aac397b597d464b53b75e9660 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 01:07:24 -0800
Subject: [PATCH 081/217] allow cpack'ing components by doing a dummy install
 and tar'ing everything up ourselves

---
 .../bin/tmpl/cpp.cpack.tmpl.sh                | 91 ++++++++++++++++---
 1 file changed, 76 insertions(+), 15 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 04c87fca8..3daa97423 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -6,12 +6,17 @@
 # CPack ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
-#  -v,--verbose                 verbose output
+#  -h,--help,--usage                            print this text
+#  -v,--verbose                                 verbose output
 #
 # Options that require values:
-#  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
-#                               (default: none)
+#  --component <comp>                           Component-based install. Only install component <comp>.
+#                                               (default: all)
+#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
+#                                               (default: none)
+#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+#  -o,--out-dir <dir>                           copy cpack'd TGZ file into <dir>
+#                                               (default: none)
 
 cpack_${CPP_LIB}_cpp() {
     local -;
@@ -25,21 +30,77 @@ cpack_${CPP_LIB}_cpp() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -v,--verbose
+        --strip
+        --config
+        --default-directory-permissions
+    ' - <<< "${@@Q}")";
+
+    test ${#component[@]} -eq 0 && component=(all);
 
     time (
-        (
-            cd "${CPP_SRC}"/build/latest/;
-            cpack -G TGZ ${v:+-V};
-        ) || true;
-
-        if test -d "${out_dir}"/; then
-            find "${CPP_SRC}"/build/latest/     \
-                -iname "${CPP_LIB}-*.tar.gz"    \
-                -print0                         \
-          | xargs -0 -I% cp -a "%" "${out_dir}"/;
+        local comp;
+        local name;
+        local slug;
+        local outd;
+        local vers;
+        local kernel;
+
+        kernel="$(uname -s)";
+
+        if test -f "${CPP_SRC}"/build/latest/CPackConfig.cmake; then
+            name="$(grep -e '^set(CPACK_PACKAGE_NAME ".*")$' "${CPP_SRC}"/build/latest/CPackConfig.cmake | head -n1)";
+            vers="$(grep -e '^set(CPACK_PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/CPackConfig.cmake | head -n1)";
+            name="${name#*\"}"; name="${name%\"*}";
+            vers="${vers#*\"}"; vers="${vers%\"*}";
+        elif test -f "${CPP_SRC}"/build/latest/CPackSourceConfig.cmake; then
+            name="$(grep -e '^set(CPACK_PACKAGE_NAME ".*")$' "${CPP_SRC}"/build/latest/CPackSourceConfig.cmake | head -n1)";
+            vers="$(grep -e '^set(CPACK_PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/CPackSourceConfig.cmake | head -n1)";
+            name="${name#*\"}"; name="${name%\"*}";
+            vers="${vers#*\"}"; vers="${vers%\"*}";
+        else
+            if grep -qe '^CMAKE_PROJECT_NAME:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt; then
+                name="$(grep -e '^CMAKE_PROJECT_NAME:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt | head -n1)";
+                name="${name##*=}";
+            fi
+            if grep -qe '^CMAKE_PROJECT_VERSION:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt; then
+                vers="$(grep -e '^CMAKE_PROJECT_VERSION:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt | head -n1)";
+                vers="${vers##*=}";
+            elif test -f "${CPP_SRC}"/build/latest/${CPP_LIB}ConfigVersion.cmake; then
+                vers="$(grep -e '^set(PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/${CPP_LIB}ConfigVersion.cmake | head -n1)";
+                vers="${vers#*\"}"; vers="${vers%\"*}";
+            elif test -f "${CPP_SRC}"/build/latest/${CPP_LIB}-config-version.cmake; then
+                vers="$(grep -e '^set(PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/${CPP_LIB}-config-version.cmake | head -n1)";
+                vers="${vers#*\"}"; vers="${vers%\"*}";
+            fi
+        fi
+
+        if test -z "${name:-}" || test -z "${vers:-}"; then
+            exit 1;
         fi
 
+        for comp in "${component[@]}"; do
+
+            if test "all" = "${comp}";
+                then comp="";
+            fi
+
+            slug="${name}-${vers}${comp:+-$comp}-${kernel}";
+            outd="${CPP_SRC}/build/latest/_CPack_Packages/${kernel}/TGZ";
+
+            install-${CPP_LIB}-cpp -p "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}";
+
+            if test -d "${outd}/${slug}"; then
+                tar -C "${outd}" -cz ${v:+-v} -f "${outd}/${slug}.tar.gz" "${slug}";
+                cp -a "${outd}/${slug}.tar.gz" "${CPP_SRC}/build/latest/";
+                if test -d "${out_dir}"/ \
+                && test -f "${CPP_SRC}/build/latest/${slug}.tar.gz"; then
+                    cp -a "${CPP_SRC}/build/latest/${slug}.tar.gz" "${out_dir}"/;
+                fi
+            fi
+        done
+
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} CPack time:";
     ) 2>&1;
 }

From f64e6496109679be87cbf960316f8052f234e472 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 01:09:50 -0800
Subject: [PATCH 082/217] fix issue with scripts with no value params, fix
 handling of unknown short opts like -Wno-dev

---
 .../bin/parse-args-from-docstring.sh          | 30 ++++----
 .../utils/opt/devcontainer/bin/parse-args.sh  | 76 +++++++++----------
 2 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
index 85e4a59b5..5e8efd763 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -35,38 +35,34 @@ parse_value_types_from_usage() {
   | sed -rn 's/^[ ]*(--?[^ \*]+|,|_)+[ ]*([<(].[^)>]*)([)>]).*$/\2\3/p';
 }
 
-parse_short_names() {
+_listify() {
     cat -                                   \
-  `# skip the long opts`                    \
-  | sed -r 's/([ ]?--[^ ,]+)+,?//g'         \
-  `# take the short opts`                   \
-  | sed -r 's/-([^ ,\*]+)+[,\*]?/\1/g'      \
   `# trim whitespace`                       \
   | tr -s '[:space:]'                       \
   `# replace spaces with pipes`             \
   | tr '[:space:]' '|'                      \
   | rev | cut -d'|' -f1 --complement | rev  \
-  `# replace pipes with spaces`             \
-  | tr '|' ' '                              \
+  `# replace pipes with newlines`           \
+  | tr '|' '\n'                             \
     ;
 }
 
+parse_short_names() {
+    cat -                                   \
+  `# skip the long opts`                    \
+  | sed -r 's/([ ]?--[^ ,]+)+,?//g'         \
+  `# take the short opts`                   \
+  | sed -r 's/-([^ ,\*]+)+[,\*]?/\1/g'      \
+  | _listify;
+}
+
 parse_long_names() {
     cat -                                        \
   `# take the long opts`                         \
   | sed -r 's/(-[^ ,\*]+)?[ ]?(--[^,]+)+,?/\2/g' \
   `# remove the leading --`                      \
   | sed -r 's/--?([^ ,]+)+/\1/g'                 \
-  `# trim whitespace`                            \
-  | tr -s '[:space:]'                            \
-  `# replace newlines with spaces`               \
-  | tr '[:space:]' ' '                           \
-  `# replace spaces with pipes`                  \
-  | sed -r 's/ /|/g'                             \
-  | rev | cut -d'|' -f1 --complement | rev       \
-  `# replace pipes with spaces`                  \
-  | tr '|' ' '                                   \
-    ;
+  | _listify;
 }
 
 parse_aliases() {
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 77991d2aa..df3048e33 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 
 # shellcheck disable=SC1091
-. devcontainer-utils-parse-args-from-docstring;
+. "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/parse-args-from-docstring.sh";
 
 parse_args() {
     local -;
@@ -10,13 +10,14 @@ parse_args() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"parse-args"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"parse-args"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
     local -r usage="$(print_usage "${1:-}")";
     shift;
 
+    local idx;
     local key;
     local typ;
     local val;
@@ -47,10 +48,10 @@ parse_args() {
         fi
     fi
 
-    local -r optstring="$(                                           \
-        cat <(echo "${short_bools[@]}" | xargs -d' ' -I% echo -n %)  \
-            <(echo "${short_value[@]}" | xargs -d' ' -I% echo -n %:) \
-      | tr -d '[:space:]'                                            \
+    local -r optstring="$(                                                                               \
+        cat <(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names | xargs -r -I% echo -n %)  \
+            <(parse_value_names_from_usage <<< "${usage}" | parse_short_names | xargs -r -I% echo -n %:) \
+      | tr -d '[:space:]'                                                                                \
     )";
 
     if test ${#long_bools[@]} -gt 0 || test ${#long_value[@]} -gt 0; then
@@ -94,6 +95,7 @@ parse_args() {
             arg=();
             key=;
             val=;
+            idx=$((OPTIND-1));
 
             # shellcheck disable=SC2254
             case "${opt}" in
@@ -105,36 +107,34 @@ parse_args() {
                     ;;
                 # unknown short opt
                 \?)
-                    opts+=("${!OPTIND:-${OPTARG:+-$OPTARG}}");
-
-                    # Splice the argument at index `OPTIND` out of $@
-                    set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
-
-                    # Peek at the next argument.
-                    # If it begins with `-`, leave it for getopts.
-                    # Otherwise, shift it onto the skipped list.
-
-                    # Guard here because there may not be another argument
-                    # at index `OPTIND` after the splice we did above.
-                    val="${!OPTIND:-}";
-                    # Slice off the leading `-X`. Note, this only works
-                    # when getopts is in silent mode, i.e. when `:` is
-                    # at the front of getopts' optstring. If getopts is
-                    # not in silent mode, it does not populate `OPTARG`.
-                    val="${val#-"${OPTARG:-}"}";
-
-                    case "${val}" in
-                        # unknown short opt with value after =
-                        *=*) ;;
-                        # unknown short opt with possible value following
-                        *)
-                            if [ -n "${!OPTIND:-}" ] && [[ "${!OPTIND}" != -* ]]; then
-                                opts+=("${!OPTIND}");
-                                # Splice the argument at index `OPTIND` out of $@
-                                set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
-                            fi
-                            ;;
-                    esac
+                    # Compare ${OPTARG} to ${!idx} with its leading `-`.
+                    # This only works when getopts is in silent mode, i.e. when `:` is at the front of the optstring.
+                    # If getopts is not in silent mode, it does not populate `OPTARG`.
+                    if [[ "-${OPTARG}" != "${!idx:-}" ]]; then
+                        # Special cases:
+                        # -f=foo
+                        # -Wno-dev
+                        opts+=("${!OPTIND:-}");
+                        # Splice the argument at index `OPTIND` out of $@
+                        set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
+                    else
+                        # Normal cases:
+                        # -f
+                        # -f foo
+                        opts+=("-${OPTARG}");
+                        OPTIND=$((OPTIND <= 1 ? 1 : OPTIND-1));
+                        # Splice the argument at index `OPTIND` out of $@
+                        set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
+
+                        # Peek at the next argument.
+                        # If it begins with `-`, leave it for getopts.
+                        # Otherwise, push it onto the skipped list and splice it out of $@.
+                        if [[ "${!OPTIND:--}" != -* ]]; then
+                            opts+=("${!OPTIND}");
+                            # Splice the argument at index `OPTIND` out of $@
+                            set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
+                        fi
+                    fi
                     break;
                     ;;
                 # long opt
@@ -300,6 +300,4 @@ parse_args() {
     fi
 }
 
-if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = devcontainer-utils-parse-args ]; then
-    parse_args "$@" <&0;
-fi
+parse_args "$@" <&0;

From fc48c8af797d7b338ee278091a053296f698e313 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 01:10:33 -0800
Subject: [PATCH 083/217] cleanup

---
 .../rapids-build-utils/bin/generate-scripts.sh  | 17 +++++++----------
 .../bin/make-conda-dependencies.sh              |  3 +--
 .../bin/make-pip-dependencies.sh                |  3 +--
 .../rapids-build-utils/bin/query-manifest.sh    |  2 +-
 .../bin/tmpl/cpp.install.tmpl.sh                | 10 +++++-----
 .../bin/tmpl/repo.clone.tmpl.sh                 |  2 ++
 .../opt/devcontainer/bin/github/repo/clone.sh   |  2 ++
 .../opt/devcontainer/bin/gitlab/repo/clone.sh   |  2 ++
 8 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 259f7173f..e85f6b380 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -370,16 +370,13 @@ generate_scripts() {
     done;
 }
 
-if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = rapids-generate-scripts ]; then
+clean_completions;
+clean_scripts;
 
-    clean_completions;
-    clean_scripts;
-
-    for pid in $(generate_scripts "$@"); do
-        while [[ -e "/proc/$pid" ]]; do
-            sleep 0.1
-        done
+for pid in $(generate_scripts "$@"); do
+    while [[ -e "/proc/$pid" ]]; do
+        sleep 0.1
     done
+done
 
-    generate_completions;
-fi
+generate_completions;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 55f03dc76..e5e364856 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -42,8 +42,7 @@ make_conda_dependencies() {
         --repo
     ' - <<< "${@@Q}")";
 
-    # shellcheck disable=SC2206
-    key=(${key[@]:-all});
+    test ${#key[@]} -eq 0 && key=(all);
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]' <<< "${cuda_version}")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index cbfa7eb79..d733ee011 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -44,8 +44,7 @@ make_pip_dependencies() {
         --repo
     ' - <<< "${@@Q}")";
 
-    # shellcheck disable=SC2206
-    key=(${key[@]:-py_build py_run py_test all});
+    test ${#key[@]} -eq 0 && key=(py_build py_run py_test all);
 
     local cuda_version="${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}";
     cuda_version="$(grep -o '^[0-9]*.[0-9]*' <<< "${cuda_version}")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index 1d9660ffe..c9918a59d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -42,7 +42,7 @@ query_manifest() {
           }
         ]
         | map(select(.key))
-        | map("declare " + .key + "; " + .key + "=" + (.val | @sh | gsub("[\\n]"; " ")))[]
+        | map("declare " + .key + "=" + (.val | @sh | gsub("[\\n]"; " ")))[]
 ________EOF
 )";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index 5afec4199..eb07e7252 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -11,13 +11,13 @@
 #  --strip                      Strip before installing.
 #
 # Options that require values:
-#  -p,--prefix <dir>                            Install C++ library into <dir>
-#                                               (default: none)
-#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
-#                                               (default: none)
 #  --component <comp>                           Component-based install. Only install component <comp>.
 #                                               (default: all)
+#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
+#                                               (default: none)
 #  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+#  -p,--prefix <dir>                            Install C++ library into <dir>
+#                                               (default: none)
 
 install_${CPP_LIB}_cpp() {
     local -;
@@ -38,7 +38,7 @@ install_${CPP_LIB}_cpp() {
         --default-directory-permissions
     ' - <<< "${@@Q}")";
 
-    component=(${component[@]:-all});
+    test ${#component[@]} -eq 0 && component=(all);
     prefix="${p:-${CMAKE_INSTALL_PREFIX:-/usr/local}}";
 
     local comp;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index cd9aee44c..af27a50f3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -7,6 +7,7 @@
 #
 # Boolean options:
 #  -h,--help,--usage            print this text
+#  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
 #  --no-update-env              don't update the Python env with the repo's dependencies after cloning
@@ -37,6 +38,7 @@ clone_${NAME}() {
     fi
 
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -q,--quiet
         --no-fork
         --clone-upstream
     ' - <<< "${@@Q}")";
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 9300e565c..49eb5fcc5 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -9,6 +9,7 @@
 #
 # Boolean options:
 #  -h,--help,--usage            print this text
+#  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
 #  --no-update-env              don't update the Python env with the repo's dependencies after cloning
@@ -93,6 +94,7 @@ clone_github_repo() {
     fi
 
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -q,--quiet
         -j,--parallel
     ' - <<< "${@@Q}")";
 
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index f628af889..fabc75168 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -9,6 +9,7 @@
 #
 # Boolean options:
 #  -h,--help,--usage            print this text
+#  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
 #  --no-update-env              don't update the Python env with the repo's dependencies after cloning
@@ -109,6 +110,7 @@ clone_gitlab_repo() {
     set -euo pipefail;
 
     eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -q,--quiet
         -j,--parallel
     ' - <<< "${@@Q}")";
 

From f50d874768d7dac3be5bebbb09d23ff502d7da9c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 02:27:40 -0800
Subject: [PATCH 084/217] don't add empty strings to arg list

---
 features/src/utils/opt/devcontainer/bin/parse-args.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index df3048e33..2601470ab 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -158,11 +158,12 @@ parse_args() {
                         $long_value1)
                             typ="value";
                             key="${OPTARG}";
-                            if [ -n "${!OPTIND:-}" ] && [[ "${!OPTIND}" != -* ]]; then
+                            arg+=("--${key}");
+                            if [[ "${!OPTIND:--}" != -* ]]; then
                                 val="${!OPTIND}";
+                                arg+=("${val}");
                                 OPTIND=$((OPTIND + 1));
                             fi
-                            arg+=("--${key}" "${val}");
                             ;;
                         # known value opt with value after =
                         $long_value2)
@@ -178,7 +179,7 @@ parse_args() {
                         # unknown long opt with value following
                         *)
                             opts+=("--${OPTARG}");
-                            if [ -n "${!OPTIND:-}" ] && [[ "${!OPTIND}" != -* ]]; then
+                            if [[ "${!OPTIND:--}" != -* ]]; then
                                 opts+=("${!OPTIND}");
                                 OPTIND=$((OPTIND + 1));
                             fi

From cb555c5c29dd8dde9296b832825b039d5ff4e63d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 02:27:52 -0800
Subject: [PATCH 085/217] handle args better

---
 .../bin/tmpl/all.clean.tmpl.sh                |  6 +++--
 .../bin/tmpl/all.cpack.tmpl.sh                | 24 ++++++++++++++-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index d1acd0952..9bdc9669b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -25,7 +25,9 @@ clean_all() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -v,--verbose
+    ' - <<< "${@@Q}")";
 
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
 
@@ -33,7 +35,7 @@ clean_all() {
   | tr '[:space:]' '\0'                 \
   | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
     if type clean-% >/dev/null 2>&1; then
-        clean-% $* || exit 255;
+        clean-% ${OPTS[*]} || exit 255;
     fi
     ";
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index 07ab9be60..7ec751ef4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -8,12 +8,18 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help,--usage                            print this text
+#  -v,--verbose                                 verbose output
 #
 # Options that require values:
-#  -j,--parallel <num>          Clone <num> repos in parallel
-#  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
-#                               (default: none)
+#  -j,--parallel <num>                          CPack <num> repos in parallel
+#  --component <comp>                           Component-based install. Only install component <comp>.
+#                                               (default: all)
+#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
+#                                               (default: none)
+#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+#  -o,--out-dir <dir>                           copy cpack'd TGZ file into <dir>
+#                                               (default: none)
 
 cpack_all() {
     local -;
@@ -26,7 +32,13 @@ cpack_all() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+        -v,--verbose
+        --component
+        --config
+        --default-directory-permissions
+        -o,--out-dir
+    ' - <<< "${@@Q}")";
 
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
 
@@ -34,7 +46,7 @@ cpack_all() {
   | tr '[:space:]' '\0'                 \
   | xargs -r -0 -P${n_jobs} -I% bash -c "
     if type cpack-% >/dev/null 2>&1; then
-        cpack-% $* || exit 255;
+        cpack-% ${OPTS[*]} || exit 255;
     fi
     ";
 }

From 7b7130687e4ae91027cbae2c50bf7115d1b6caf2 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 02:30:18 -0800
Subject: [PATCH 086/217] add missing --strip arg

---
 .../opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index 7ec751ef4..f31b5af6f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -10,6 +10,7 @@
 # Boolean options:
 #  -h,--help,--usage                            print this text
 #  -v,--verbose                                 verbose output
+#  --strip                                      Strip before installing.
 #
 # Options that require values:
 #  -j,--parallel <num>                          CPack <num> repos in parallel

From c50f11e2c0908e3cab8829dc51d0316325eef157 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 11:19:29 -0800
Subject: [PATCH 087/217] clean dot files too

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index f0cad1087..eb12dc8f7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -26,8 +26,10 @@ clean_${CPP_LIB}_cpp() {
         exit 1;
     fi
 
-    rm -rf "${CPP_SRC}/build/latest"/* \
-           "${CPP_SRC}"/compile_commands.json;
+    rm -rf -- \
+        "${CPP_SRC}/build/latest"/{*,.*} \
+        "${CPP_SRC}"/compile_commands.json \
+        2>/dev/null || true;
 }
 
 clean_${CPP_LIB}_cpp "$@";

From d4e553c7dcfd7f07df5b84551c77201901010ac2 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 13:33:14 -0800
Subject: [PATCH 088/217] cpack in parallel with pigz

---
 features/src/rapids-build-utils/install.sh          |  2 +-
 .../bin/get-num-archs-jobs-and-load.sh              | 11 +++++++----
 .../rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh   | 13 +++++++++----
 .../rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh   |  8 ++++++--
 .../rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh  |  4 +++-
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index b617b418f..21869efe1 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -7,7 +7,7 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )";
 # install global/common scripts
 . ./common/install.sh;
 
-check_packages bc jq sudo wget gettext-base bash-completion ca-certificates;
+check_packages bc jq pigz sudo wget gettext-base bash-completion ca-certificates;
 
 # Install yq if not installed
 if ! type yq >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 47f0aee11..9b256111b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -10,11 +10,13 @@
 # note: This wouldn't be necessary if `nvcc` interacted with the POSIX jobserver.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #
 # Options that require values:
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
 #                                         (default: 1)
+#  --max-archs <num>                      Build at most <num> CUDA archs in parallel
+#                                         (default: 3)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
 #  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
@@ -40,6 +42,7 @@ get_num_archs_jobs_and_load() {
         j=$(nproc);
     fi
 
+    max_archs="${max_archs:-3}";
     parallel="${j:-${JOBS:-${PARALLEL_LEVEL:-1}}}";
     max_device_obj_memory_usage="${m:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-1}}";
 
@@ -58,7 +61,7 @@ get_num_archs_jobs_and_load() {
                 ;;
             all | all-major)
                 # Max out at 3 threads per object
-                n_arch=3;
+                n_arch=${max_archs};
                 ;;
             ALL | RAPIDS)
                 # currently: 60-real;70-real;75-real;80-real;86-real;90
@@ -73,8 +76,8 @@ get_num_archs_jobs_and_load() {
         esac
     fi
 
-    # Clamp between 1 and 3 threads per nvcc job
-    n_arch=$(( n_arch < 1 ? 1 : n_arch > 3 ? 3 : n_arch ));
+    # Clamp between 1 and ${max_archs} threads per nvcc job
+    n_arch=$(( n_arch < 1 ? 1 : n_arch > max_archs ? max_archs : n_arch ));
 
     local -r free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
     local -r freeswap=$(free --giga | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index f31b5af6f..5b366e3da 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -8,12 +8,13 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage                            print this text
+#  -h,--help                                    print this text
 #  -v,--verbose                                 verbose output
 #  --strip                                      Strip before installing.
 #
 # Options that require values:
 #  -j,--parallel <num>                          CPack <num> repos in parallel
+#                                               (default: 1)
 #  --component <comp>                           Component-based install. Only install component <comp>.
 #                                               (default: all)
 #  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
@@ -41,13 +42,17 @@ cpack_all() {
         -o,--out-dir
     ' - <<< "${@@Q}")";
 
-    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
+    j=${j:-1};
+    local -r n_repos=$(wc -w <<< "${NAMES}");
+    local k=$((n_repos / j));
+
+    eval "$(rapids-get-num-archs-jobs-and-load -j "${j}" -a "${k}" --max-archs "${k}")";
 
     echo "${NAMES}"                     \
   | tr '[:space:]' '\0'                 \
-  | xargs -r -0 -P${n_jobs} -I% bash -c "
+  | xargs -r -0 -P${n_load} -I% bash -c "
     if type cpack-% >/dev/null 2>&1; then
-        cpack-% ${OPTS[*]} || exit 255;
+        cpack-% -j ${n_arch} ${OPTS[*]} || exit 255;
     fi
     ";
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 3daa97423..50c9f5bcb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -6,10 +6,12 @@
 # CPack ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage                            print this text
+#  -h,--help                                    print this text
 #  -v,--verbose                                 verbose output
 #
 # Options that require values:
+#  -j,--parallel <num>                          Use <num> to compress in parallel
+#                                               (default: $(nproc))
 #  --component <comp>                           Component-based install. Only install component <comp>.
 #                                               (default: all)
 #  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
@@ -37,6 +39,8 @@ cpack_${CPP_LIB}_cpp() {
         --default-directory-permissions
     ' - <<< "${@@Q}")";
 
+    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
+
     test ${#component[@]} -eq 0 && component=(all);
 
     time (
@@ -92,7 +96,7 @@ cpack_${CPP_LIB}_cpp() {
             install-${CPP_LIB}-cpp -p "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}";
 
             if test -d "${outd}/${slug}"; then
-                tar -C "${outd}" -cz ${v:+-v} -f "${outd}/${slug}.tar.gz" "${slug}";
+                tar -C "${outd}" -c ${v:+-v} -f "${outd}/${slug}.tar.gz" -I "pigz -p ${n_jobs}" "${slug}";
                 cp -a "${outd}/${slug}.tar.gz" "${CPP_SRC}/build/latest/";
                 if test -d "${out_dir}"/ \
                 && test -f "${CPP_SRC}/build/latest/${slug}.tar.gz"; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
index 6aa110390..25cb14ee4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
@@ -6,10 +6,12 @@
 # CPack ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -v,--verbose                 verbose output
 #
 # Options that require values:
+#  -j,--parallel <num>          Use <num> to compress in parallel
+#                               (default: $(nproc))
 #  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
 #                               (default: none)
 

From e517e2f4708357d0193baef6d869258bc46751db Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 13:37:09 -0800
Subject: [PATCH 089/217] support --take and --skip to only parse selected args

---
 .../bin/tmpl/python.build.tmpl.sh             | 39 ++++++++-
 .../bin/tmpl/repo.build.tmpl.sh               | 36 ++++++--
 .../utils/opt/devcontainer/bin/parse-args.sh  | 86 ++++++++++++-------
 3 files changed, 120 insertions(+), 41 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
index f17b23511..81ef58ba8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
@@ -6,12 +6,45 @@
 # Build an editable install or wheel of ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
+#  --ignore-requires-python               Ignore the Requires-Python information.
+#  --no-clean                             Don't clean up build directories.
+#  --no-deps                              Don't install package dependencies.
+#  --no-verify                            Don't verify if built wheel is valid.
+#  --no-cache-dir                         Disable the pip cache.
+#  --use-pep517                           Use PEP 517 for building source distributions.
+#  --no-use-pep517                        Don't use PEP 517 for building source distributions
+#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
+#                                         dependencies specified by PEP 518 must be already installed if this option is
+#                                         used.
+#  --pre                                  Include pre-release and development versions. By default, pip only finds
+#                                         stable versions.
+#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
+#                                         newer.
 #
 # Options that require values:
 #  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
 #                                         (default: editable)
+#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#                                         (default: 1)
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#                                         (default: $(nproc))
+#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#                                         is expected to take. This is used to estimate the number of parallel device
+#                                         object compilations that can be launched without hitting the system memory
+#                                         limit.
+#                                         Higher values yield fewer parallel CUDA device object compilations.
+#                                         (default: 1)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+#  --cache-dir <dir>                      Store the cache data in <dir>.
+#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
+#                                         adds to the existing value. Accepts either ":all:" to disable all source
+#                                         packages, ":none:" to empty the set, or one or more package names with commas
+#                                         between them. Packages without binary distributions will fail to install when
+#                                         this option is used on them.
+#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
+#                                         (default: none)
 
 build_${PY_LIB}_python() {
     local -;
@@ -25,7 +58,9 @@ build_${PY_LIB}_python() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(devcontainer-utils-parse-args "$0" --take '
+        -t,--type
+    ' - <<< "${@@Q}")";
 
     build-${PY_LIB}-python-${t:-${type:-"editable"}} "${OPTS[@]}";
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
index 2162b6099..db541eabd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
@@ -6,22 +6,45 @@
 # Configure and build ${CPP_LIB}, then build an editable install or wheel of ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
+#  --ignore-requires-python               Ignore the Requires-Python information.
+#  --no-clean                             Don't clean up build directories.
+#  --no-deps                              Don't install package dependencies.
+#  --no-verify                            Don't verify if built wheel is valid.
+#  --no-cache-dir                         Disable the pip cache.
+#  --use-pep517                           Use PEP 517 for building source distributions.
+#  --no-use-pep517                        Don't use PEP 517 for building source distributions
+#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
+#                                         dependencies specified by PEP 518 must be already installed if this option is
+#                                         used.
+#  --pre                                  Include pre-release and development versions. By default, pip only finds
+#                                         stable versions.
+#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
+#                                         newer.
 #
 # Options that require values:
+#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
+#                                         (default: editable)
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
 #                                         (default: 1)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#                                         (default: $(nproc))
 #  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
 #                                         limit.
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
-#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
-#                                         (default: editable)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+#  --cache-dir <dir>                      Store the cache data in <dir>.
+#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
+#                                         adds to the existing value. Accepts either ":all:" to disable all source
+#                                         packages, ":none:" to empty the set, or one or more package names with commas
+#                                         between them. Packages without binary distributions will fail to install when
+#                                         this option is used on them.
+#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
+#                                         (default: none)
 
 build_${NAME}() {
     local -;
@@ -35,11 +58,8 @@ build_${NAME}() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
-        -v,--verbose
-        -a,--archs
-        -j,--parallel
-        -m,--max-device-obj-memory-usage
+    eval "$(devcontainer-utils-parse-args "$0" --take '
+        -t,--type
     ' - <<< "${@@Q}")";
 
     for lib in ${CPP_LIB}; do
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 2601470ab..b83841574 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -28,6 +28,7 @@ parse_args() {
     local -A typs=();
     local -a rest=();
 
+    local -A take_map=();
     local -A skip_map=();
     local -A reverse_alias_map=();
     local -Ar alias_map="($(parse_all_names_from_usage     <<< "${usage}" | parse_aliases))";
@@ -36,18 +37,53 @@ parse_args() {
     local -ar short_bools="($(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names))";
     local -ar short_value="($(parse_value_names_from_usage <<< "${usage}" | parse_short_names))";
 
-    if [ "${1:-}" = "--passthrough" ]; then
-        shift;
-        if test -n "${1:-}"; then
-            local -ar pass_through="($(echo "${1}" | parse_args_to_names))";
-            for key in "${pass_through[@]}"; do
-                # shellcheck disable=SC2034
-                skip_map["${key}"]=1;
-            done
+    for ((idx=0; idx < 2; idx+=1)); do
+        if [ "${1:-}" = "--take" ]; then
+            shift;
+            if test -n "${1:-}"; then
+                local -ar take="($(echo "${1}" | parse_args_to_names))";
+                for key in "${take[@]}"; do
+                    # shellcheck disable=SC2034
+                    take_map["${key}"]=1;
+                done
+                shift;
+            fi
+        fi
+        if [ "${1:-}" = "--skip" ] || [ "${1:-}" = "--passthrough" ]; then
             shift;
+            if test -n "${1:-}"; then
+                local -ar skip="($(echo "${1}" | parse_args_to_names))";
+                for key in "${skip[@]}"; do
+                    # shellcheck disable=SC2034
+                    skip_map["${key}"]=1;
+                done
+                shift;
+            fi
         fi
+    done
+
+    if test ${#take_map[@]} -eq 0; then
+        for key in "${long_bools[@]}" "${short_bools[@]}" \
+                   "${long_value[@]}" "${short_value[@]}"; do
+            take_map[${key}]=1;
+        done
     fi
 
+    # Always include the -h,--help flags
+    take_map["h"]=1;
+    take_map["help"]=1;
+
+    for key in "${!alias_map[@]}"; do
+        args["${key}"]="";
+        local -a aliases="(${alias_map[${key}]})";
+        for alias in "${aliases[@]}"; do
+            reverse_alias_map["${alias}"]="${key}";
+        done
+    done
+
+    for key in "${long_bools[@]}" "${short_bools[@]}"; do typs[${key}]="bool"; done
+    for key in "${long_value[@]}" "${short_value[@]}"; do typs[${key}]="value"; done
+
     local -r optstring="$(                                                                               \
         cat <(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names | xargs -r -I% echo -n %)  \
             <(parse_value_names_from_usage <<< "${usage}" | parse_short_names | xargs -r -I% echo -n %:) \
@@ -67,17 +103,6 @@ parse_args() {
     local -r short_bools1="@($(echo -n "${short_bools[@]/%/ |}" | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))";
     local -r short_value1="@($(echo -n "${short_value[@]/%/ |}" | rev | cut -d'|' -f1 --complement | rev | tr -d '[:space:]'))";
 
-    for key in "${!alias_map[@]}"; do
-        args["${key}"]="";
-        local -a aliases="(${alias_map[${key}]})";
-        for alias in "${aliases[@]}"; do
-            reverse_alias_map["${alias}"]="${key}";
-        done
-    done
-
-    for key in "${long_bools[@]}" "${short_bools[@]}"; do typs[${key}]="bool"; done
-    for key in "${long_value[@]}" "${short_value[@]}"; do typs[${key}]="value"; done
-
     while test -n "${1:-}"; do
 
         # read from stdin on hyphen
@@ -230,20 +255,19 @@ parse_args() {
 
             if test -n "${key}"; then
 
-                if test -v skip_map["${key}"]; then
+                if test -v skip_map["${key}"] || ! test -v take_map["${key}"]; then
                     opts+=("${arg[@]}");
-                fi
-
-                if test -v reverse_alias_map["${key}"]; then
-                    key="${reverse_alias_map["${key}"]}";
-                fi
-
-                if test "${typ}" = bool; then
-                    args["${key}"]="${val@Q}";
-                elif test -z "${args["${key}"]}"; then
-                    args["${key}"]="${val@Q}";
                 else
-                    args["${key}"]+=" ${val@Q}";
+                    if test -v reverse_alias_map["${key}"]; then
+                        key="${reverse_alias_map["${key}"]}";
+                    fi
+                    if test "${typ}" = bool; then
+                        args["${key}"]="${val@Q}";
+                    elif test -z "${args["${key}"]}"; then
+                        args["${key}"]="${val@Q}";
+                    else
+                        args["${key}"]+=" ${val@Q}";
+                    fi
                 fi
             fi
 

From 1632870f661866848707e8b9fa501266d32dc158 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 13:38:06 -0800
Subject: [PATCH 090/217] assume each repo has 3 submodules to clone in
 parallel

---
 .../rapids-build-utils/bin/tmpl/all.clone.tmpl.sh    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index b28e5733a..d66b67d31 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -6,7 +6,7 @@
 # Runs clone-<repo> for each repo in "${NAMES}".
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -v,--verbose                 verbose output
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
@@ -35,19 +35,13 @@ clone_all() {
         --clone-upstream
     ' - <<< "${@@Q}")";
 
-    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
-
-    local -r n_repos=$(wc -w <<< "${NAMES}");
-    n_jobs=$((n_repos < n_jobs ? n_repos : n_jobs));
-
-    local n_modules=$((n_jobs / n_repos));
-    n_modules=$((n_modules < 1 ? 1 : n_modules));
+    eval "$(rapids-get-num-archs-jobs-and-load -a3 "$@")";
 
     echo "${NAMES}"                     \
   | tr '[:space:]' '\0'                 \
   | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
     if type clone-% >/dev/null 2>&1; then
-        clone-% -j ${n_modules} --no-update-env ${OPTS[*]} || exit 255;
+        clone-% -j ${n_arch} --no-update-env ${OPTS[*]} || exit 255;
     fi
     ";
 

From 805e5fd0c19b6403c5c590c873935cffc8ee3dfa Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 13:39:32 -0800
Subject: [PATCH 091/217] clean up

---
 .../bin/checkout-same-branch.sh               |  2 +-
 .../opt/rapids-build-utils/bin/list-repos.sh  |  4 ++--
 .../bin/make-conda-dependencies.sh            |  4 ++--
 .../rapids-build-utils/bin/make-conda-env.sh  |  4 ++--
 .../bin/make-pip-dependencies.sh              |  4 ++--
 .../rapids-build-utils/bin/make-pip-env.sh    |  4 ++--
 .../bin/pull-repositories.sh                  |  2 +-
 .../bin/push-repositories.sh                  |  2 +-
 .../bin/python-conda-pkg-names.sh             |  2 +-
 .../bin/python-pkg-names.sh                   |  2 +-
 .../bin/python-pkg-roots.sh                   |  2 +-
 .../rapids-build-utils/bin/query-manifest.sh  |  2 +-
 .../bin/tmpl/all.build.tmpl.sh                | 24 ++++++++++++++++++-
 .../bin/tmpl/all.clean.tmpl.sh                |  4 ++--
 .../bin/tmpl/all.clone.tmpl.sh                |  2 +-
 .../bin/tmpl/all.configure.tmpl.sh            |  2 +-
 .../bin/tmpl/all.cpack.tmpl.sh                |  2 +-
 .../bin/tmpl/all.install.tmpl.sh              |  2 +-
 .../rapids-build-utils/bin/tmpl/all.tmpl.sh   |  2 +-
 .../bin/tmpl/all.uninstall.tmpl.sh            |  2 +-
 .../bin/tmpl/cpp.build.tmpl.sh                |  2 +-
 .../bin/tmpl/cpp.clean.tmpl.sh                |  2 +-
 .../bin/tmpl/cpp.configure.tmpl.sh            |  2 +-
 .../bin/tmpl/cpp.cpack.tmpl.sh                |  2 +-
 .../bin/tmpl/cpp.install.tmpl.sh              |  4 ++--
 .../bin/tmpl/cpp.uninstall.tmpl.sh            |  2 +-
 .../bin/tmpl/python.build.editable.tmpl.sh    |  3 ++-
 .../bin/tmpl/python.build.wheel.tmpl.sh       |  3 ++-
 .../bin/tmpl/python.clean.tmpl.sh             |  2 +-
 .../bin/tmpl/python.uninstall.tmpl.sh         |  2 +-
 .../bin/tmpl/repo.clean.tmpl.sh               |  2 +-
 .../bin/tmpl/repo.clone.tmpl.sh               |  4 ++--
 .../bin/tmpl/repo.configure.tmpl.sh           |  2 +-
 .../bin/tmpl/repo.install.tmpl.sh             |  2 +-
 .../bin/tmpl/repo.uninstall.tmpl.sh           |  2 +-
 .../bin/bash/generate-bash-completion.sh      |  2 +-
 .../opt/devcontainer/bin/git/repo/clone.sh    |  4 ++--
 .../opt/devcontainer/bin/github/repo/clone.sh |  4 ++--
 .../opt/devcontainer/bin/gitlab/repo/clone.sh |  4 ++--
 .../utils/opt/devcontainer/bin/parse-args.sh  |  2 +-
 .../bin/vault/s3/creds/persist.sh             |  2 +-
 41 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index c222a23f3..2036fd221 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -8,7 +8,7 @@
 # then checks out all repositories to this common branch.
 #
 # Boolean options:
-#  -h,--help,--usage  print this text
+#  -h,--help          print this text
 #
 # Options that require values:
 #  -j,--parallel <num>   Fetch <num> repos in parallel
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 1b4194a7c..132bab94a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -6,7 +6,7 @@
 # Query the `manifest.yaml` in a shell-friendly format, optionally filtering results by repository name.
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
@@ -27,7 +27,7 @@ list_repos() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -m,--manifest
     ' - <<< "${@@Q}")";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index e5e364856..e1d9f8b01 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -6,7 +6,7 @@
 # Generate a combined conda environment YAML file for all repos.
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #
 # Options that require values:
 #  -k,--key <key>        Only include the key(s)
@@ -36,7 +36,7 @@ make_conda_dependencies() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -m,--manifest
         -o,--omit
         --repo
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index b71f616a0..f278e07ae 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -6,7 +6,7 @@
 # Make a combined conda environment for all repos.
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #  -f,--force            Delete the existing conda env and recreate it from scratch.
 #
 # Options that require values:
@@ -32,7 +32,7 @@ make_conda_env() {
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.yml";
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -k,--key
         -m,--manifest
         -o,--omit
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index d733ee011..b7b7e24cd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -6,7 +6,7 @@
 # Generate a combined pip requirements file for all repos.
 #
 # Boolean options:
-#  -h,--help,--usage       print this text
+#  -h,--help               print this text
 #  --no-dedupe             don't sort and dedupe the combined requirements.txt
 #
 # Options that require values:
@@ -38,7 +38,7 @@ make_pip_dependencies() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -m,--manifest
         -o,--omit
         --repo
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 85e920018..a45c36e0a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -6,7 +6,7 @@
 # Make a combined pip virtual environment for all repos.
 #
 # Boolean options:
-#  -h,--help,--usage       print this text
+#  -h,--help               print this text
 #  -f,--force              Delete the existing pip venv and recreate it from scratch.
 #  --no-dedupe             don't sort and dedupe the combined requirements.txt
 #
@@ -34,7 +34,7 @@ make_pip_env() {
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.requirements.txt";
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         --no-dedupe
         -k,--key
         -m,--manifest
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 95229d487..45050ab45 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -6,7 +6,7 @@
 # Pull the latest commits from each repository's upstream remote.
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index adb7deb3b..0ef9b3877 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -6,7 +6,7 @@
 # Push the latest commits from each repository to the origin remote.
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index 7fedbae69..29745bc28 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -9,7 +9,7 @@
 # conda env.
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index 6e72c7638..cce87fc98 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -6,7 +6,7 @@
 # List python package names as determined by manifest.yaml
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index dcc9ccab3..ca3ea4917 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -6,7 +6,7 @@
 # List python package source dirs as determined by manifest.yaml
 #
 # Boolean options:
-#  -h,--help,--usage     print this text
+#  -h,--help             print this text
 #
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index c9918a59d..a7400b73b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -6,7 +6,7 @@
 # Query the `manifest.yaml` in a shell-friendly format.
 #
 # Boolean options:
-#  -h,--help,--usage  print this text
+#  -h,--help          print this text
 #
 # Options that require values:
 #  -m,--manifest <file>  Use a specific manifest.json
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
index a92fe965a..428e5fff3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -8,8 +8,22 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
+#  --ignore-requires-python               Ignore the Requires-Python information.
+#  --no-clean                             Don't clean up build directories.
+#  --no-deps                              Don't install package dependencies.
+#  --no-verify                            Don't verify if built wheel is valid.
+#  --no-cache-dir                         Disable the pip cache.
+#  --use-pep517                           Use PEP 517 for building source distributions.
+#  --no-use-pep517                        Don't use PEP 517 for building source distributions
+#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
+#                                         dependencies specified by PEP 518 must be already installed if this option is
+#                                         used.
+#  --pre                                  Include pre-release and development versions. By default, pip only finds
+#                                         stable versions.
+#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
+#                                         newer.
 #
 # Options that require values:
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
@@ -24,6 +38,14 @@
 #  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
 #                                         (default: editable)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+#  --cache-dir <dir>                      Store the cache data in <dir>.
+#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
+#                                         adds to the existing value. Accepts either ":all:" to disable all source
+#                                         packages, ":none:" to empty the set, or one or more package names with commas
+#                                         between them. Packages without binary distributions will fail to install when
+#                                         this option is used on them.
+#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
+#                                         (default: none)
 
 build_all() {
     local -;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index 9bdc9669b..97e5f3e06 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -8,7 +8,7 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -v,--verbose                 verbose output
 #
 # Options that require values:
@@ -25,7 +25,7 @@ clean_all() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
     ' - <<< "${@@Q}")";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index d66b67d31..724925af6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -30,7 +30,7 @@ clone_all() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         --no-fork
         --clone-upstream
     ' - <<< "${@@Q}")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
index 435af21f3..74ee50e0e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
@@ -8,7 +8,7 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
 #
 # Options that require values:
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index 5b366e3da..f7c85924c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -34,7 +34,7 @@ cpack_all() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
         --component
         --config
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
index a8f29d649..c1b1ba8bf 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
@@ -8,7 +8,7 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
 #  --strip                      Strip before installing.
 #
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
index c6580f48d..69b95d03a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
@@ -8,7 +8,7 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
 
 ${SCRIPT}_all() {
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
index 7b62b10fa..92a947044 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
@@ -8,7 +8,7 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
 
 uninstall_all() {
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index cc420364f..88e0342fa 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -6,7 +6,7 @@
 # Configure and build ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -v,--verbose                 verbose output
 #
 # Options that require values:
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index eb12dc8f7..c0dddfa96 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -6,7 +6,7 @@
 # Clean the ${CPP_LIB} build dirs.
 #
 # Boolean options:
-#  -h,--help,--usage  print this text
+#  -h,--help          print this text
 
 clean_${CPP_LIB}_cpp() {
     local -;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index accae1806..918f1e151 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -6,7 +6,7 @@
 # Configure ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
 #
 # Options that require values:
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 50c9f5bcb..87dd23d48 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -32,7 +32,7 @@ cpack_${CPP_LIB}_cpp() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
         --strip
         --config
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index eb07e7252..e64440aa2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -6,7 +6,7 @@
 # Install ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -v,--verbose                 Enable verbose output.
 #  --strip                      Strip before installing.
 #
@@ -31,7 +31,7 @@ install_${CPP_LIB}_cpp() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
         --strip
         --config
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 234278a47..c6c99d66c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -6,7 +6,7 @@
 # Uninstall ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage  print this text
+#  -h,--help          print this text
 #  -v,--verbose       verbose output
 
 uninstall_${CPP_LIB}_cpp() {
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index c1c2e6c8d..a551112df 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -6,7 +6,7 @@
 # Build ${PY_LIB} in editable mode.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
 #
 # Options that require values:
@@ -20,6 +20,7 @@
 #                                         limit.
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
 build_${PY_LIB}_python_editable() {
     local -;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index a7c599fba..d640dc88c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -6,7 +6,7 @@
 # Build a ${PY_LIB} wheel.
 #
 # Boolean options:
-#  -h,--help,--usage                      print this text
+#  -h,--help                              print this text
 #  -v,--verbose                           verbose output
 #  --ignore-requires-python               Ignore the Requires-Python information.
 #  --no-clean                             Don't clean up build directories.
@@ -34,6 +34,7 @@
 #                                         limit.
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
+#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 #  --cache-dir <dir>                      Store the cache data in <dir>.
 #  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
 #                                         adds to the existing value. Accepts either ":all:" to disable all source
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index 78fc243b7..c44815257 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -6,7 +6,7 @@
 # Clean the ${PY_LIB} build dirs.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 
 clean_${PY_LIB}_python() {
     local -;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index db2805073..2c64a92c4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -6,7 +6,7 @@
 # Uninstall ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage print this text
+#  -h,--help         print this text
 #  -v,--verbose      verbose output
 
 uninstall_${PY_LIB}_python() {
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
index 65477604f..398f6b243 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
@@ -6,7 +6,7 @@
 # Clean the ${NAME} repository.
 #
 # Boolean options:
-#  -h,--help,--usage  print this text
+#  -h,--help          print this text
 
 clean_${NAME}() {
     local -;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index af27a50f3..3f6ca6cf6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -6,7 +6,7 @@
 # Clone the ${NAME} repository.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
@@ -37,7 +37,7 @@ clone_${NAME}() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
         --no-fork
         --clone-upstream
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
index 850df8078..591a65279 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
@@ -8,7 +8,7 @@
 # Forwards all arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -v,--verbose                 verbose output
 #
 # Options that require values:
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
index 23e040106..d232b6a4f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
@@ -6,7 +6,7 @@
 # Install ${CPP_LIB} and ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage  print this text
+#  -h,--help          print this text
 #  -v,--verbose       verbose output
 #  --strip                      Strip before installing.
 #
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index 075e3f70d..0c7ca1a90 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -6,7 +6,7 @@
 # Uninstall ${CPP_LIB} and ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help,--usage  print this text
+#  -h,--help          print this text
 #  -v,--verbose       verbose output
 
 uninstall_${NAME}() {
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index b8cab4236..cbb74dbe3 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -6,7 +6,7 @@
 # Generate a bash completion script for a command.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -v,--verbose                 verbose output
 #
 # Options that require values:
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 6893e372d..142f4da31 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -8,7 +8,7 @@
 # If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
@@ -38,7 +38,7 @@ clone_git_repo() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
         -j,--parallel
     ' - <<< "${@@Q}")";
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 49eb5fcc5..1ad377e24 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -8,7 +8,7 @@
 # If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
@@ -93,7 +93,7 @@ clone_github_repo() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
         -j,--parallel
     ' - <<< "${@@Q}")";
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index fabc75168..0bc81bd42 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -8,7 +8,7 @@
 # If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
 #
 # Boolean options:
-#  -h,--help,--usage            print this text
+#  -h,--help                    print this text
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
 #                               (default: false)
@@ -109,7 +109,7 @@ clone_gitlab_repo() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" --passthrough '
+    eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
         -j,--parallel
     ' - <<< "${@@Q}")";
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index b83841574..e79902170 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -49,7 +49,7 @@ parse_args() {
                 shift;
             fi
         fi
-        if [ "${1:-}" = "--skip" ] || [ "${1:-}" = "--passthrough" ]; then
+        if [ "${1:-}" = "--skip" ]; then
             shift;
             if test -n "${1:-}"; then
                 local -ar skip="($(echo "${1}" | parse_args_to_names))";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index 33f96034b..77c73da1e 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -6,7 +6,7 @@
 # Set, unset, or reset the S3 bucket, region, and credentials in the environment.
 #
 # Boolean options:
-#  -h,--help,--usage              print this text
+#  -h,--help                      print this text
 #  --no-bucket                    Unset the $SCCACHE_BUCKET environment variable for all shells.
 #                                 (default: false)
 #  --no-region                    Unset the $SCCACHE_REGION environment variable for all shells.

From b8e1d22cb76c27107a24da0eafe87b5b4a4b79d2 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 20:59:26 -0800
Subject: [PATCH 092/217] bool arguments are the complement of all and value
 args

---
 .../bin/parse-args-from-docstring.sh          | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
index 5e8efd763..f4fb9a633 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -11,30 +11,45 @@ parse_args_to_names() {
   ;
 }
 
+_squeeze_spaces_in_options() {
+    cat - \
+    `# Filter for lines that start with 0-4 spaces and a dash` \
+  | grep -P '^[ ]{0,4}-[^ ].*$'                                \
+    `# squeeze spaces between short and long args (-f, --foo)` \
+  | sed -r 's/(-[^ <(-]+,) (--[^ ]+)/\1\2/g'                   \
+    ;
+}
+
 parse_all_names_from_usage() {
     cat - \
+  | _squeeze_spaces_in_options \
   | sed -rn 's/^([ ]*)(--?[^*][^ *]+|,|_)+(.*)$/\2/p' \
   | sed -r 's/(,|\|)/ /g' \
   ;
 }
 
-parse_bool_names_from_usage() {
-    cat - \
-  | sed -rn 's/^([ ]*)(--?[^ ]+|,|_)+([^<(]*)$/\2/p' \
-  | sed -r 's/(,|\|)/ /g';
-}
-
 parse_value_names_from_usage() {
     cat - \
+  | _squeeze_spaces_in_options \
   | sed -rn 's/^([ ]*)(--?[^ \*]+|,|_)+[ ]*[<(](.[^)>]*).*$/\2/p' \
   | sed -r 's/(,|\|)/ /g';
 }
 
 parse_value_types_from_usage() {
     cat - \
+  | _squeeze_spaces_in_options \
   | sed -rn 's/^[ ]*(--?[^ \*]+|,|_)+[ ]*([<(].[^)>]*)([)>]).*$/\2\3/p';
 }
 
+parse_bool_names_from_usage() {
+    tee >(parse_all_names_from_usage)   \
+        >(parse_value_names_from_usage) \
+        1>/dev/null \
+  | sort -s         \
+  | uniq -u         \
+  | sed -r 's/(,|\|)/ /g';
+}
+
 _listify() {
     cat -                                   \
   `# trim whitespace`                       \
@@ -44,6 +59,7 @@ _listify() {
   | rev | cut -d'|' -f1 --complement | rev  \
   `# replace pipes with newlines`           \
   | tr '|' '\n'                             \
+  | grep -v -e '^$'                         \
     ;
 }
 

From 8f3176f7a49556f882514af5dcd464f9e09c3578 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 21:00:10 -0800
Subject: [PATCH 093/217] install into CONDA_PREFIX if defined

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index e64440aa2..26ee7bd7e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -39,7 +39,7 @@ install_${CPP_LIB}_cpp() {
     ' - <<< "${@@Q}")";
 
     test ${#component[@]} -eq 0 && component=(all);
-    prefix="${p:-${CMAKE_INSTALL_PREFIX:-/usr/local}}";
+    prefix="${p:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}";
 
     local comp;
     for comp in "${component[@]}"; do
@@ -48,9 +48,9 @@ install_${CPP_LIB}_cpp() {
         fi
         time (
             cmake \
-                --install "${CPP_SRC}"/build/latest/                 \
-                --prefix "${p:-${CMAKE_INSTALL_PREFIX:-/usr/local}}" \
-                ${comp:+--component "${comp}"}                       \
+                --install "${CPP_SRC}"/build/latest/                            \
+                --prefix "${p:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}" \
+                ${comp:+--component "${comp}"}                                  \
                 "${OPTS[@]}";
             { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB}${component:+ $component} install time:";
         ) 2>&1;

From 34a73c6b1c0da44da36e81067654c1ea746eab02 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 1 Feb 2024 21:02:40 -0800
Subject: [PATCH 094/217] remove pip args from docstring

---
 .../bin/tmpl/all.build.tmpl.sh                | 27 +++----------------
 .../bin/tmpl/repo.build.tmpl.sh               | 22 ---------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
index 428e5fff3..1165a26f4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -10,42 +10,21 @@
 # Boolean options:
 #  -h,--help                              print this text
 #  -v,--verbose                           verbose output
-#  --ignore-requires-python               Ignore the Requires-Python information.
-#  --no-clean                             Don't clean up build directories.
-#  --no-deps                              Don't install package dependencies.
-#  --no-verify                            Don't verify if built wheel is valid.
-#  --no-cache-dir                         Disable the pip cache.
-#  --use-pep517                           Use PEP 517 for building source distributions.
-#  --no-use-pep517                        Don't use PEP 517 for building source distributions
-#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
-#                                         dependencies specified by PEP 518 must be already installed if this option is
-#                                         used.
-#  --pre                                  Include pre-release and development versions. By default, pip only finds
-#                                         stable versions.
-#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
-#                                         newer.
 #
 # Options that require values:
+#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
+#                                         (default: editable)
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
 #                                         (default: 1)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#                                         (default: $(nproc))
 #  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
 #                                         limit.
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
-#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
-#                                         (default: editable)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
-#  --cache-dir <dir>                      Store the cache data in <dir>.
-#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
-#                                         adds to the existing value. Accepts either ":all:" to disable all source
-#                                         packages, ":none:" to empty the set, or one or more package names with commas
-#                                         between them. Packages without binary distributions will fail to install when
-#                                         this option is used on them.
-#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
-#                                         (default: none)
 
 build_all() {
     local -;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
index db541eabd..4dd279efc 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
@@ -8,20 +8,6 @@
 # Boolean options:
 #  -h,--help                              print this text
 #  -v,--verbose                           verbose output
-#  --ignore-requires-python               Ignore the Requires-Python information.
-#  --no-clean                             Don't clean up build directories.
-#  --no-deps                              Don't install package dependencies.
-#  --no-verify                            Don't verify if built wheel is valid.
-#  --no-cache-dir                         Disable the pip cache.
-#  --use-pep517                           Use PEP 517 for building source distributions.
-#  --no-use-pep517                        Don't use PEP 517 for building source distributions
-#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
-#                                         dependencies specified by PEP 518 must be already installed if this option is
-#                                         used.
-#  --pre                                  Include pre-release and development versions. By default, pip only finds
-#                                         stable versions.
-#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
-#                                         newer.
 #
 # Options that require values:
 #  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
@@ -37,14 +23,6 @@
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
-#  --cache-dir <dir>                      Store the cache data in <dir>.
-#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
-#                                         adds to the existing value. Accepts either ":all:" to disable all source
-#                                         packages, ":none:" to empty the set, or one or more package names with commas
-#                                         between them. Packages without binary distributions will fail to install when
-#                                         this option is used on them.
-#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
-#                                         (default: none)
 
 build_${NAME}() {
     local -;

From b9afa1d01340225f6ab7388a3dfed7b7bd54ff44 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 2 Feb 2024 02:54:23 -0800
Subject: [PATCH 095/217] ensure cpp deps propagate to python scripts

---
 .../opt/rapids-build-utils/bin/generate-scripts.sh  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index e85f6b380..0eef78a87 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -235,6 +235,7 @@ generate_scripts() {
         repo_name="${!repo_name,,}";
         repo_names+=("${repo_name}");
 
+        local deps=();
         local cpp_libs=();
         local cpp_dirs=();
 
@@ -256,7 +257,7 @@ generate_scripts() {
 
             cpp_name_to_path["${cpp_name}"]="${cpp_path}";
 
-            local deps=();
+            local cpp_deps=();
 
             for ((k=0; k < ${!cpp_depends_length:-0}; k+=1)); do
                 local dep="${repo}_cpp_${j}_depends_${k}";
@@ -266,9 +267,10 @@ generate_scripts() {
                 fi
                 local dep_cpp_path="${cpp_name_to_path["${dep_cpp_name}"]}";
 
-                deps+=("-D${!dep}_ROOT=\"${dep_cpp_path}/build/latest\"");
-                deps+=("-D${!dep,,}_ROOT=\"${dep_cpp_path}/build/latest\"");
-                deps+=("-D${!dep^^}_ROOT=\"${dep_cpp_path}/build/latest\"");
+                cpp_deps+=("-D${!dep}_ROOT=\"${dep_cpp_path}/build/latest\"");
+                cpp_deps+=("-D${!dep,,}_ROOT=\"${dep_cpp_path}/build/latest\"");
+                cpp_deps+=("-D${!dep^^}_ROOT=\"${dep_cpp_path}/build/latest\"");
+                deps+=(${cpp_deps[@]});
             done
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
@@ -277,14 +279,13 @@ generate_scripts() {
                 CPP_LIB="${cpp_name:-}"      \
                 CPP_SRC="${!cpp_sub_dir:-}"  \
                 CPP_ARGS="${!cpp_args:-}"    \
-                CPP_DEPS="${deps[*]}"        \
+                CPP_DEPS="${cpp_deps[*]}"    \
                 generate_cpp_scripts         ;
             # ) || true;
             fi
         done
 
         local args=();
-        local deps=();
 
         for ((k=0; k < ${#cpp_libs[@]}; k+=1)); do
             # Define both lowercase and uppercase

From d719a474443f0e7ba0ec3bd8bdbc1927585656f3 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 2 Feb 2024 11:13:32 -0800
Subject: [PATCH 096/217] skip cpack'ing if there's no CMakeCache.txt

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 87dd23d48..c0fa83f6d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -39,6 +39,10 @@ cpack_${CPP_LIB}_cpp() {
         --default-directory-permissions
     ' - <<< "${@@Q}")";
 
+    if ! test -f "${CPP_SRC}/build/latest/CMakeCache.txt"; then
+        exit 0;
+    fi
+
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
 
     test ${#component[@]} -eq 0 && component=(all);

From 946c030885a25a6e208d0f2c9c5826f3fc6fecec Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 2 Feb 2024 14:06:34 -0800
Subject: [PATCH 097/217] expand with quotes

---
 .../bin/generate-scripts.sh                   | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 0eef78a87..9a76bf774 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -270,18 +270,16 @@ generate_scripts() {
                 cpp_deps+=("-D${!dep}_ROOT=\"${dep_cpp_path}/build/latest\"");
                 cpp_deps+=("-D${!dep,,}_ROOT=\"${dep_cpp_path}/build/latest\"");
                 cpp_deps+=("-D${!dep^^}_ROOT=\"${dep_cpp_path}/build/latest\"");
-                deps+=(${cpp_deps[@]});
+                deps+=("${cpp_deps[@]}");
             done
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-            # (
                 SRC_PATH=~/"${!repo_path:-}" \
                 CPP_LIB="${cpp_name:-}"      \
                 CPP_SRC="${!cpp_sub_dir:-}"  \
                 CPP_ARGS="${!cpp_args:-}"    \
                 CPP_DEPS="${cpp_deps[*]}"    \
                 generate_cpp_scripts         ;
-            # ) || true;
             fi
         done
 
@@ -315,7 +313,6 @@ generate_scripts() {
             py_libs+=("${!py_name}");
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-            # (
                 SRC_PATH=~/"${!repo_path:-}"              \
                 PY_SRC="${py_path}"                       \
                 PY_LIB="${!py_name}"                      \
@@ -326,33 +323,28 @@ generate_scripts() {
                 PIP_WHEEL_ARGS="${!pip_wheel_args:-}"     \
                 PIP_INSTALL_ARGS="${!pip_install_args:-}" \
                 generate_python_scripts                   ;
-            # ) || true;
             fi
         done;
 
         if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-        # (
             NAME="${repo_name:-}"    \
             PY_LIB="${py_libs[*]}"   \
             CPP_LIB="${cpp_libs[*]}" \
             generate_repo_scripts    ;
-        # ) || true;
         fi
 
         # Generate a clone script for each repo
-        # (
-            NAME="${repo_name:-}"             \
-            SRC_PATH=~/"${!repo_path:-}"      \
-            PY_LIB="${py_libs[*]}"            \
-            PY_SRC="${py_dirs[*]}"            \
-            CPP_LIB="${cpp_libs[*]}"          \
-            CPP_SRC="${cpp_dirs[*]}"          \
-            GIT_TAG="${!git_tag:-}"           \
-            GIT_REPO="${!git_repo:-}"         \
-            GIT_HOST="${!git_host:-}"         \
-            GIT_UPSTREAM="${!git_upstream:-}" \
-            generate_clone_script             ;
-        # ) || true;
+        NAME="${repo_name:-}"             \
+        SRC_PATH=~/"${!repo_path:-}"      \
+        PY_LIB="${py_libs[*]@Q}"          \
+        PY_SRC="${py_dirs[*]@Q}"          \
+        CPP_LIB="${cpp_libs[*]@Q}"        \
+        CPP_SRC="${cpp_dirs[*]@Q}"        \
+        GIT_TAG="${!git_tag:-}"           \
+        GIT_REPO="${!git_repo:-}"         \
+        GIT_HOST="${!git_host:-}"         \
+        GIT_UPSTREAM="${!git_upstream:-}" \
+        generate_clone_script             ;
     done
 
     sudo find /opt/rapids-build-utils \
@@ -363,11 +355,9 @@ generate_scripts() {
 
     for script in "clone" "clean" "configure" "build" "cpack" "install" "uninstall"; do
         # Generate a script to run a script for all repos
-        # (
-            NAMES="${repo_names[*]}" \
-            SCRIPT="${script}"       \
-            generate_all_script      ;
-        # ) || true;
+        NAMES="${repo_names[*]}" \
+        SCRIPT="${script}"       \
+        generate_all_script      ;
     done;
 }
 

From bd149fd6307f1eb06ce4240763eb8aaf75a25742 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 2 Feb 2024 23:08:22 -0800
Subject: [PATCH 098/217] use bash-completion-lib to complete directories and
 filenames

---
 .../devcontainer/bin/bash/completion.tmpl.sh  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
index c6b3b34eb..b34067da5 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
@@ -62,42 +62,42 @@ _devcontainer_utils_completions() {
         option_names["${CMD}"]="${bool_names[${CMD}]} ${value_names[${CMD}]}";
     fi
 
+    local cur="${COMP_WORDS[$COMP_CWORD]}";
+    local prev="${COMP_WORDS[$COMP_CWORD-1]}";
+
     if test "${COMP_CWORD}" -gt 1; then
         while read -r name_and_type; do
             local -a pair;
             read -a pair -r <<< "${name_and_type}";
             local name_="${pair[0]}";
             local type_="${pair[1]}";
-            if [[ ${name_} == ${COMP_WORDS[$COMP_CWORD-1]}* ]]; then
+            if [[ ${name_} == ${prev}* ]]; then
                 case "${type_}" in
                     "<num>")
                         # shellcheck disable=SC2207
-                        COMPREPLY=($(grep -P "^[0-9]+$" <<< "${COMP_WORDS[$COMP_CWORD]}"));
+                        COMPREPLY=($(grep -P "^[0-9]+$" <<< "${cur}"));
                         return;
                         ;;
                     "<dir>")
-                        # shellcheck disable=SC2207
-                        COMPREPLY=($(compgen -o nosort -o dirnames -- "${COMP_WORDS[$COMP_CWORD]}"));
+                        _filedir -d;
                         return;
                         ;;
                     "<file>")
-                        # shellcheck disable=SC2207
-                        COMPREPLY=($(compgen -o nosort -o filenames -- "${COMP_WORDS[$COMP_CWORD]}"));
+                        _filedir;
                         return;
                         ;;
                     "<path>")
-                        # shellcheck disable=SC2207
-                        COMPREPLY=($(compgen -o nosort -o default -- "${COMP_WORDS[$COMP_CWORD]}"));
+                        _filedir;
                         return;
                         ;;
                     \(*\))
                         local -a list=();
                         IFS=$'|' read -a list -r <<< "${type_:1:-1}";
-                        if test ${#COMP_WORDS[$COMP_CWORD]} -eq 0; then
+                        if test ${#cur} -eq 0; then
                             COMPREPLY=("${list[@]}");
                         else
                             for item in "${list[@]}"; do
-                                if [[ ${item} =~ ^${COMP_WORDS[$COMP_CWORD]} ]]; then
+                                if [[ ${item} =~ ^${cur} ]]; then
                                     COMPREPLY+=("${item}");
                                 fi
                             done
@@ -116,9 +116,9 @@ _devcontainer_utils_completions() {
     declare -a bools="(${bool_names[${CMD}]})";
 
     for ((idx_a=0; idx_a < ${#bools[@]}; idx_a+=1)); do
-        if [[ ${bools[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
+        if [[ ${bools[$idx_a]} == ${cur}* ]]; then
             # shellcheck disable=SC2207
-            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${COMP_WORDS[$COMP_CWORD]}"));
+            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${cur}"));
             return;
         fi
     done
@@ -126,9 +126,9 @@ _devcontainer_utils_completions() {
     declare -a value="(${value_names[${CMD}]})";
 
     for ((idx_a=0; idx_a < ${#value[@]}; idx_a+=1)); do
-        if [[ ${value[$idx_a]} == ${COMP_WORDS[$COMP_CWORD]}* ]]; then
+        if [[ ${value[$idx_a]} == ${cur}* ]]; then
             # shellcheck disable=SC2207
-            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${COMP_WORDS[$COMP_CWORD]}"));
+            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${cur}"));
             return;
         fi
     done

From 3585533257b5caa00e77463e16df3353339a0f10 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 2 Feb 2024 23:09:33 -0800
Subject: [PATCH 099/217] simplify devcontainer-utils clone scripts, configure
 remote.upstream.fetch during git clone

---
 .../bin/tmpl/repo.clone.tmpl.sh               |  32 ++---
 .../opt/devcontainer/bin/git/repo/clone.sh    | 136 ++++++++----------
 .../opt/devcontainer/bin/github/repo/clone.sh |  22 ++-
 .../opt/devcontainer/bin/gitlab/repo/clone.sh |  20 ++-
 4 files changed, 91 insertions(+), 119 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 3f6ca6cf6..647b5a1e0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -3,7 +3,7 @@
 # Usage:
 #  clone-${NAME} [OPTION]...
 #
-# Clone the ${NAME} repository.
+# Clone the ${NAME} repository if it doesn't already exist.
 #
 # Boolean options:
 #  -h,--help                    print this text
@@ -53,27 +53,19 @@ clone_${NAME}() {
 
         echo 'Cloning ${NAME}' 1>&2;
 
-        devcontainer-utils-clone-${GIT_HOST}-repo \
-            --tags                                \
-            --branch "${branch}"                  \
-            --recurse-submodules                  \
-            -j ${n_jobs:-$(nproc --ignore=1)}     \
-            -c checkout.defaultRemote=upstream    \
-            "${OPTS[@]}"                          \
-            --                                    \
-            "${upstream}"                         \
-            "${directory}"                        \
+        devcontainer-utils-clone-${GIT_HOST}-repo                 \
+            --tags                                                \
+            --branch "${branch}"                                  \
+            --recurse-submodules                                  \
+            -j ${n_jobs:-$(nproc --ignore=1)}                     \
+            -c checkout.defaultRemote=upstream                    \
+            -c remote.upstream.fetch='^refs/heads/pull-request/*' \
+            "${OPTS[@]}"                                          \
+            --                                                    \
+            "${upstream}"                                         \
+            "${directory}"                                        \
         ;
 
-        git -C "${SRC_PATH}" config --add remote.upstream.fetch '^refs/heads/pull-request/*';
-
-        local upstream_branches="$(git -C "${SRC_PATH}" branch --remotes --list 'upstream/pull-request/*')";
-        if test -n "${upstream_branches:-}"; then
-            git -C "${SRC_PATH}" branch --remotes -d ${upstream_branches};
-        fi
-
-        git -C "${SRC_PATH}" remote prune upstream;
-
         if test -z "${no_update_env}"; then
             rapids-update-content-command;
             rapids-post-attach-command;
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 142f4da31..6b82d43e1 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -1,30 +1,22 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  devcontainer-utils-clone-git-repo [OPTION]... <directory>
+#  devcontainer-utils-clone-git-repo [OPTION]... [--] <repository> [<directory>]
 #
-# Clone a GitLab repository for the logged in user (as reported by `glab auth status`).
-#
-# If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
+# Clone a git repository, optionally checking out a branch or tag, and optionally setting the upstream remote.
 #
 # Boolean options:
 #  -h,--help                    print this text
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
-#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
-#                               (default: false)
-#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
-#                               (default: false)
-#  --clone-upstream             always clone the upstream, not the user's fork
-#                               (default: false)
 #
 # Options that require values:
 #  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
-#                               (default: `${NAME}.git.tag` in manifest.yaml)
-#  -j,--parallel <num>          Clone <num> submodules in parallel
+#  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel
 #  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
 #
 # Positional arguments:
-#  directory                    clone the repo into <directory>
+#  repository                   The (possibly remote) repository to clone
+#  directory                    The name of a new directory to clone into
 
 clone_git_repo() {
     local -;
@@ -38,81 +30,79 @@ clone_git_repo() {
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -q,--quiet
-        -j,--parallel
-    ' - <<< "${@@Q}")";
-
-    local quiet="${q:-${quiet:-}}";
-    quiet=${quiet:+--quiet};
-
-    local branch="${b:-"${branch:-}"}";
-    local parallel="${j:-${parallel:-1}}";
-    parallel="${parallel:+-j "${parallel}"}";
-
-    local upstream="${u:-"${upstream:-}"}";
+    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
+    local origin;
+    local directory;
     local nargs="${#REST[@]}";
-    local origin="${REST[$((nargs - 2))]}";
-    origin="${origin:?origin is required}";
 
-    local directory="${REST[$((nargs - 1))]}";
-    directory="${directory:?directory is required}";
+    if test "${nargs}" -gt 1; then
+        origin="${REST[0]:?"fatal: missing required positional argument <repository>"}";
+        directory="${REST[1]:?"fatal: missing required positional argument <directory>"}";
+    else
+        if test "${nargs}" -eq 0; then
+            if test -z "${upstream:-}"; then
+                echo "fatal: missing required positional argument <repository>" 1>&2;
+                exit 1;
+            fi
+            origin="${upstream}";
+        elif test "${nargs}" -eq 1; then
+            origin="${REST[0]:?"fatal: missing required positional argument <repository>"}";
+        fi
 
+        local re="(ssh:\/\/|https:\/\/)?(git@)?(.*\.com)[:\/](.*)";
+        if [[ "${origin}" =~ ${re} ]]; then
+            directory="$(basename "${BASH_REMATCH[4]//.git/}")";
+        elif test -d "${origin}" && test -d "${origin}"/.git; then
+            directory="$(basename "${origin}")";
+        else
+            echo "fatal: '${origin}' is not a git repository" 1>&2;
+            exit 1;
+        fi
+    fi
+
+    j="${j:+-j ${j}}";
+    q="${q:+--quiet}";
     upstream="${upstream:-"${origin}"}";
+    directory="$(realpath -m "${directory}")";
 
-    if [ ! -d "${directory}"/.git ]; then
-        git clone "${OPTS[@]}" -- "${origin}" "${directory}";
+    # shellcheck disable=SC2086
+    if ! test -d "${directory}"/.git; then
+        git clone ${j} ${q} "${OPTS[@]}" -- "${origin}" "${directory}";
         git -C "${directory}" remote add upstream "${upstream}" || true;
-        # shellcheck disable=SC2086
-        git -C "${directory}" fetch ${quiet} ${parallel} upstream || true;
+        git -C "${directory}" remote set-url upstream "${upstream}" || true;
         git -C "${directory}" remote set-url --push upstream read_only || true;
-
-        if [ "${upstream}" != "${origin}" ]; then
-            git -C "${directory}" remote set-url origin "${origin}";
-        else
-            git -C "${directory}" remote set-url --push origin read_only;
+        if test "${upstream}" == "${origin}"; then
+            git -C "${directory}" remote set-url --push origin read_only || true;
         fi
+        git -C "${directory}" fetch ${j} ${q} upstream;
     fi
 
-    if [ -n "${branch:-}" ]; then
-
-        local -r upstream_has_branch="$(git -C "${directory}" ls-remote -q --exit-code -h upstream "${branch}" && echo 1 || echo)";
-        local -r upstream_has_tag="$(git -C "${directory}" ls-remote -q --exit-code -t upstream "${branch}" && echo 1 || echo)";
-        local -r origin_has_branch="$(git -C "${directory}" ls-remote -q --exit-code -h origin "${branch}" && echo 1 || echo)";
-        local -r origin_has_tag="$(git -C "${directory}" ls-remote -q --exit-code -t origin "${branch}" && echo 1 || echo)";
-
-        # shellcheck disable=SC2086
-        if false; then exit 1;
-        elif test -n "${upstream_has_branch}"; then
-            git -C "${directory}" fetch ${quiet} upstream "refs/heads/${branch}";
-            if ! git -C "${directory}" checkout ${quiet} -b "${branch}" -t "upstream/${branch}" 2>/dev/null; then
-                git -C "${directory}" checkout ${quiet} "${branch}";
-                git -C "${directory}" branch "${branch}" -u "upstream/${branch}";
-            fi
-        elif test -n "${upstream_has_tag}"; then
-            git -C "${directory}" checkout ${quiet} -m -b "upstream/${branch}" "${branch}";
-        elif test -n "${origin_has_branch}"; then
-            git -C "${directory}" fetch ${quiet} origin "refs/heads/${branch}";
-            if ! git -C "${directory}" checkout ${quiet} -b "${branch}" -t "origin/${branch}" 2>/dev/null; then
-                git -C "${directory}" checkout ${quiet} "${branch}";
-                git -C "${directory}" branch "${branch}" -u "origin/${branch}";
+    # shellcheck disable=SC2086
+    if test -n "${branch:-}"; then
+        local remote;
+        for remote in upstream origin; do
+            # if remote has branch
+            if git -C "${directory}" ls-remote -q --exit-code -h "${remote}" "${branch}"; then
+                # fetch, checkout, and track the remote branch
+                git -C "${directory}" fetch ${j} ${q} "${remote}" "refs/heads/${branch}";
+                if ! git -C "${directory}" checkout ${q} -b "${branch}" -t "${remote}/${branch}" 2>/dev/null; then
+                    git -C "${directory}" checkout ${q} "${branch}";
+                    git -C "${directory}" branch "${branch}" -u "${remote}/${branch}";
+                fi
+                git -C "${directory}" pull "${remote}" "${branch}";
+                break;
+            # if remote has tag
+            elif git -C "${directory}" ls-remote -q --exit-code -t "${remote}" "${branch}"; then
+                # make a local branch for the tag
+                git -C "${directory}" checkout ${q} -m -b "${remote}/${branch}" "${branch}";
+                break;
             fi
-        elif test -n "${origin_has_tag}"; then
-            git -C "${directory}" checkout ${quiet} -f -b "origin/${branch}" "${branch}";
-        fi
-
-        if test -n "${origin_has_branch}"; then
-            git -C "${directory}" pull origin "${branch}";
-        fi
-
-        if test -n "${upstream_has_branch}"; then
-            git -C "${directory}" pull upstream "${branch}";
-        fi
+        done
     fi
 
     # shellcheck disable=SC2086
-    git -C "${directory}" submodule update --init --recursive ${parallel} ${quiet};
+    git -C "${directory}" submodule update --init --recursive ${j} ${q};
 }
 
 clone_git_repo "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 1ad377e24..f55770c63 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  devcontainer-utils-clone-github-repo [OPTION]... <upstream> <directory>
+#  devcontainer-utils-clone-github-repo [OPTION]... [--] <upstream> [<directory>]
 #
 # Clone a GitHub repository for the logged in user (as reported by `gh auth status`).
 #
@@ -19,7 +19,7 @@
 #
 # Options that require values:
 #  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
-#  -j,--parallel <num>          Clone <num> submodules in parallel
+#  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel
 #
 # Positional arguments:
 #  upstream                     set <upstream> as the `upstream` remote
@@ -95,20 +95,14 @@ clone_github_repo() {
 
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
-        -j,--parallel
+        -j,--jobs,--parallel
     ' - <<< "${@@Q}")";
 
-    local nargs="${#REST[@]}";
-    local upstream="${REST[$((nargs - 2))]}";
-    upstream="${upstream:?upstream is required}";
+    local upstream="${REST[0]:?"fatal: missing required positional argument <upstream>"}";
 
-    local no_fork="${no_fork:-}";
-    local branch="${b:-"${branch:-}"}";
-    local parallel="${j:-${parallel:-1}}";
-    local clone_upstream="${clone_upstream:-}";
-
-    local directory="${REST[$((nargs - 1))]}";
-    directory="${directory:?directory is required}";
+    if test "${#REST[@]}" -gt 1; then
+        REST=("${REST[@]:1}");
+    fi
 
     local origin="${upstream}";
     local name=;
@@ -171,7 +165,7 @@ clone_github_repo() {
         ${upstream:+--upstream "${upstream}"} \
         "${OPTS[@]}"                          \
         --                                    \
-        "${origin}" "${directory}"            \
+        "${origin}" "${REST[@]}"              \
         ;
 }
 
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 0bc81bd42..3f4c68ff0 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  devcontainer-utils-clone-gitlab-repo [OPTION]... <upstream> <directory>
+#  devcontainer-utils-clone-gitlab-repo [OPTION]... [--] <upstream> [<directory>]
 #
 # Clone a GitLab repository for the logged in user (as reported by `glab auth status`).
 #
@@ -19,6 +19,7 @@
 #
 # Options that require values:
 #  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel
 #
 # Positional arguments:
 #  upstream                     set <upstream> as the `upstream` remote
@@ -111,19 +112,14 @@ clone_gitlab_repo() {
 
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
-        -j,--parallel
+        -j,--jobs,--parallel
     ' - <<< "${@@Q}")";
 
-    local nargs="${#REST[@]}";
-    local upstream="${REST[$((nargs - 2))]}";
-    upstream="${upstream:?upstream is required}";
+    local upstream="${REST[0]:?"fatal: missing required positional argument <upstream>"}";
 
-    local no_fork="${no_fork:-}";
-    local branch="${b:-"${branch:-}"}";
-    local clone_upstream="${clone_upstream:-}";
-
-    local directory="${REST[$((nargs - 1))]}";
-    directory="${directory:?directory is required}";
+    if test "${#REST[@]}" -gt 1; then
+        REST=("${REST[@]:1}");
+    fi
 
     local origin="${upstream}";
     local fork=;
@@ -186,7 +182,7 @@ clone_gitlab_repo() {
         ${upstream:+--upstream "${upstream}"} \
         "${OPTS[@]}"                          \
         --                                    \
-        "${origin}" "${directory}"            \
+        "${origin}" "${REST[@]}"              \
         ;
 }
 

From 7aa5107987aa675c8ab1a4345f8aa5eca2d729dc Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 2 Feb 2024 23:21:44 -0800
Subject: [PATCH 100/217] handle initial -- in rest args

---
 features/src/utils/opt/devcontainer/bin/git/repo/clone.sh   | 3 +++
 .../src/utils/opt/devcontainer/bin/github/repo/clone.sh     | 6 +++---
 .../src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh     | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 6b82d43e1..07f4d4e64 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -32,8 +32,11 @@ clone_git_repo() {
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
+    if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
+
     local origin;
     local directory;
+
     local nargs="${#REST[@]}";
 
     if test "${nargs}" -gt 1; then
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index f55770c63..b8b4ea4ce 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -98,11 +98,11 @@ clone_github_repo() {
         -j,--jobs,--parallel
     ' - <<< "${@@Q}")";
 
+    if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
+
     local upstream="${REST[0]:?"fatal: missing required positional argument <upstream>"}";
 
-    if test "${#REST[@]}" -gt 1; then
-        REST=("${REST[@]:1}");
-    fi
+    if test "${#REST[@]}" -gt 1; then REST=("${REST[@]:1}"); fi
 
     local origin="${upstream}";
     local name=;
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 3f4c68ff0..b227791d5 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -115,11 +115,11 @@ clone_gitlab_repo() {
         -j,--jobs,--parallel
     ' - <<< "${@@Q}")";
 
+    if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
+
     local upstream="${REST[0]:?"fatal: missing required positional argument <upstream>"}";
 
-    if test "${#REST[@]}" -gt 1; then
-        REST=("${REST[@]:1}");
-    fi
+    if test "${#REST[@]}" -gt 1; then REST=("${REST[@]:1}"); fi
 
     local origin="${upstream}";
     local fork=;

From cd47a150ad316de7215032dd06cf3bd86606d68e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 2 Feb 2024 23:22:08 -0800
Subject: [PATCH 101/217] don't pass -c
 remote.upstream.fetch='^refs/heads/pull-request/*' because of git clone bug

---
 .../bin/tmpl/repo.clone.tmpl.sh               | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 647b5a1e0..f66ce8754 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -53,19 +53,27 @@ clone_${NAME}() {
 
         echo 'Cloning ${NAME}' 1>&2;
 
-        devcontainer-utils-clone-${GIT_HOST}-repo                 \
-            --tags                                                \
-            --branch "${branch}"                                  \
-            --recurse-submodules                                  \
-            -j ${n_jobs:-$(nproc --ignore=1)}                     \
-            -c checkout.defaultRemote=upstream                    \
-            -c remote.upstream.fetch='^refs/heads/pull-request/*' \
-            "${OPTS[@]}"                                          \
-            --                                                    \
-            "${upstream}"                                         \
-            "${directory}"                                        \
+        devcontainer-utils-clone-${GIT_HOST}-repo \
+            --tags                                \
+            --branch "${branch}"                  \
+            --recurse-submodules                  \
+            -j ${n_jobs:-$(nproc --ignore=1)}     \
+            -c checkout.defaultRemote=upstream    \
+            "${OPTS[@]}"                          \
+            --                                    \
+            "${upstream}"                         \
+            "${directory}"                        \
         ;
 
+        git -C "${SRC_PATH}" config --add remote.upstream.fetch '^refs/heads/pull-request/*';
+
+        local upstream_branches="$(git -C "${SRC_PATH}" branch --remotes --list 'upstream/pull-request/*')";
+        if test -n "${upstream_branches:-}"; then
+            git -C "${SRC_PATH}" branch --remotes -d ${upstream_branches};
+        fi
+
+        git -C "${SRC_PATH}" remote prune upstream;
+
         if test -z "${no_update_env}"; then
             rapids-update-content-command;
             rapids-post-attach-command;

From f46c98a41b2dcd64def0a4269adf410b824603da Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:24:43 -0800
Subject: [PATCH 102/217] Fix mambaforge shell history (#219)

* disable history when restoring shell options

* Update devcontainer-feature.json
---
 features/src/mambaforge/.bashrc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/src/mambaforge/.bashrc b/features/src/mambaforge/.bashrc
index 7ef4b92be..c6804046a 100644
--- a/features/src/mambaforge/.bashrc
+++ b/features/src/mambaforge/.bashrc
@@ -6,12 +6,12 @@ for default_conda_env_name in ${DEFAULT_CONDA_ENV:-} ${CONDA_DEFAULT_ENV:-} base
         break;
     fi
     # Temporarily allow unbound variables for conda activation.
-    oldstate="$(shopt -po; shopt -p)"; [[ -o errexit ]] && oldstate="${oldstate}; set -e"; set +u;
+    oldstate="$(shopt -po | grep -E '(nounset|verbose|xtrace)')"; set +u;
     if conda activate "${default_conda_env_name}" 2>/dev/null; then
-        { set +vx; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
+        { set +vxo history; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
         break;
     else
-        { set +vx; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
+        { set +vxo history; } 2>/dev/null; eval "${oldstate}"; unset oldstate;
         continue;
     fi
 done

From dd0a1e2cb213b8b723298e84b3c86969de92692f Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Fri, 2 Feb 2024 23:24:56 -0800
Subject: [PATCH 103/217] Add cugraph-equivariant (#218)

---
 .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index e1046bd05..179b31c58 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -171,6 +171,9 @@ repos:
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
       depends: [cugraph]
+    - name: cugraph-equivariant
+      sub_dir: python/cugraph-equivariant
+      depends: [cugraph]
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
       depends: [cugraph]

From 6f3276b2464cf208aeead4c256ac7a7d24463b86 Mon Sep 17 00:00:00 2001
From: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
Date: Sun, 4 Feb 2024 19:48:58 -0800
Subject: [PATCH 104/217] Fix buildx setup on github runners (#220)

* Fix buildx setup on github runners

* change conditional to `env.RUNNER_ENV == 'self-hosted'
---
 .github/actions/setup-runner-env/action.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml
index b52487360..ae701557f 100644
--- a/.github/actions/setup-runner-env/action.yml
+++ b/.github/actions/setup-runner-env/action.yml
@@ -5,27 +5,30 @@ description: Setup self-hosted runner environment
 runs:
   using: composite
   steps:
+    - name: Dump env
+      shell: bash -eo pipefail {0}
+      run: echo "${{ toJSON(env) }}"
 
-    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
       name: Setup self-hosted runner environment
       shell: bash -eo pipefail {0}
       run: |
         echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV;
         echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV;
 
-    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: env.RUNNER_ENVIRONMENT == 'github-hosted'
+    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
@@ -33,7 +36,15 @@ runs:
       shell: bash
       run: docker context create builder
 
-    - name: Setup docker buildx
+    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
+      name: Setup docker buildx on github-hosted runners
+      uses: docker/setup-buildx-action@v2
+      with:
+        buildkitd-flags: --debug
+        endpoint: builder
+
+    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
+      name: Setup docker buildx on self-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
         buildkitd-flags: --debug --config /etc/buildkit/buildkitd.toml

From 29112d8cdb2d1dce8382efa9dba5769aca24604f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 4 Feb 2024 20:08:26 -0800
Subject: [PATCH 105/217] bump versions

---
 features/src/cccl-dev/devcontainer-feature.json           | 2 +-
 features/src/cmake/devcontainer-feature.json              | 2 +-
 features/src/cuda/devcontainer-feature.json               | 2 +-
 features/src/gcc/devcontainer-feature.json                | 2 +-
 features/src/gitlab-cli/devcontainer-feature.json         | 2 +-
 features/src/llvm/devcontainer-feature.json               | 2 +-
 features/src/ninja/devcontainer-feature.json              | 2 +-
 features/src/nvhpc/devcontainer-feature.json              | 2 +-
 features/src/oneapi/devcontainer-feature.json             | 2 +-
 features/src/rapids-build-utils/devcontainer-feature.json | 2 +-
 features/src/rust/devcontainer-feature.json               | 2 +-
 features/src/sccache/devcontainer-feature.json            | 2 +-
 features/src/ucx/devcontainer-feature.json                | 2 +-
 features/src/utils/devcontainer-feature.json              | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
index b75458b46..ec55977a5 100644
--- a/features/src/cccl-dev/devcontainer-feature.json
+++ b/features/src/cccl-dev/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA CCCL development utilities",
   "id": "cccl-dev",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {
diff --git a/features/src/cmake/devcontainer-feature.json b/features/src/cmake/devcontainer-feature.json
index d3159dddf..79373cbf9 100644
--- a/features/src/cmake/devcontainer-feature.json
+++ b/features/src/cmake/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CMake",
   "id": "cmake",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install CMake",
   "options": {
     "version": {
diff --git a/features/src/cuda/devcontainer-feature.json b/features/src/cuda/devcontainer-feature.json
index e4c4bead9..ff53bb846 100644
--- a/features/src/cuda/devcontainer-feature.json
+++ b/features/src/cuda/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "CUDA Toolkit",
   "id": "cuda",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install the NVIDIA CUDA Toolkit",
   "options": {
     "version": {
diff --git a/features/src/gcc/devcontainer-feature.json b/features/src/gcc/devcontainer-feature.json
index 0aa1deb53..057520837 100644
--- a/features/src/gcc/devcontainer-feature.json
+++ b/features/src/gcc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "GCC",
   "id": "gcc",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install gcc",
   "options": {
     "version": {
diff --git a/features/src/gitlab-cli/devcontainer-feature.json b/features/src/gitlab-cli/devcontainer-feature.json
index 9562d59f2..89791f5f1 100644
--- a/features/src/gitlab-cli/devcontainer-feature.json
+++ b/features/src/gitlab-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "gitlab-cli",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "name": "GitLab CLI",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/gitlab-cli",
   "description": "Installs the GitLab CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/features/src/llvm/devcontainer-feature.json b/features/src/llvm/devcontainer-feature.json
index 45fad8f49..d7c9d95a8 100644
--- a/features/src/llvm/devcontainer-feature.json
+++ b/features/src/llvm/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "LLVM compilers and tools",
   "id": "llvm",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install LLVM compilers and tools",
   "options": {
     "version": {
diff --git a/features/src/ninja/devcontainer-feature.json b/features/src/ninja/devcontainer-feature.json
index 0df8f2f06..171a0cf10 100644
--- a/features/src/ninja/devcontainer-feature.json
+++ b/features/src/ninja/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Ninja build",
   "id": "ninja",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install ninja-build",
   "options": {
     "version": {
diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json
index 7019155e4..cf88f7086 100644
--- a/features/src/nvhpc/devcontainer-feature.json
+++ b/features/src/nvhpc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVHPC SDK",
   "id": "nvhpc",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "version": {
diff --git a/features/src/oneapi/devcontainer-feature.json b/features/src/oneapi/devcontainer-feature.json
index 8230fad33..6538918d5 100644
--- a/features/src/oneapi/devcontainer-feature.json
+++ b/features/src/oneapi/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Intel oneapi toolchain",
   "id": "oneapi",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install the Intel oneapi toolchain",
   "options": {
     "version": {
diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index de3167297..d4b210343 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/rust/devcontainer-feature.json b/features/src/rust/devcontainer-feature.json
index 80f27fcaf..f670217c1 100644
--- a/features/src/rust/devcontainer-feature.json
+++ b/features/src/rust/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "rust",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "name": "Rust",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/rust",
   "description": "Installs Rust, common Rust utilities, and their required dependencies",
diff --git a/features/src/sccache/devcontainer-feature.json b/features/src/sccache/devcontainer-feature.json
index cddd2ba8f..f40d43805 100644
--- a/features/src/sccache/devcontainer-feature.json
+++ b/features/src/sccache/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "sccache",
   "id": "sccache",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install sccache",
   "options": {
     "version": {
diff --git a/features/src/ucx/devcontainer-feature.json b/features/src/ucx/devcontainer-feature.json
index 6915c84c4..6d9aa80fe 100644
--- a/features/src/ucx/devcontainer-feature.json
+++ b/features/src/ucx/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "UCX",
   "id": "ucx",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install UCX",
   "options": {
     "version": {
diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index cab922aac..e079868fc 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.4.0",
+  "version": "24.4.1",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

From 5edf5db447e64d1da084784461b1a50d9af8e50a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 11 Jan 2024 12:40:28 -0800
Subject: [PATCH 106/217] ensure user bin dirs don't end up on the path
 multiple times

---
 features/common/install.sh                        | 2 ++
 features/src/cccl-dev/common/install.sh           | 2 ++
 features/src/cmake/common/install.sh              | 2 ++
 features/src/cuda/common/install.sh               | 2 ++
 features/src/gcc/common/install.sh                | 2 ++
 features/src/gitlab-cli/common/install.sh         | 2 ++
 features/src/llvm/common/install.sh               | 2 ++
 features/src/mambaforge/common/install.sh         | 2 ++
 features/src/ninja/common/install.sh              | 2 ++
 features/src/nvhpc/common/install.sh              | 2 ++
 features/src/oneapi/common/install.sh             | 2 ++
 features/src/rapids-build-utils/common/install.sh | 2 ++
 features/src/rust/common/install.sh               | 2 ++
 features/src/sccache/common/install.sh            | 2 ++
 features/src/ucx/common/install.sh                | 2 ++
 features/src/utils/common/install.sh              | 2 ++
 16 files changed, 32 insertions(+)

diff --git a/features/common/install.sh b/features/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/common/install.sh
+++ b/features/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/cccl-dev/common/install.sh b/features/src/cccl-dev/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/cccl-dev/common/install.sh
+++ b/features/src/cccl-dev/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/cmake/common/install.sh b/features/src/cmake/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/cmake/common/install.sh
+++ b/features/src/cmake/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/cuda/common/install.sh b/features/src/cuda/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/cuda/common/install.sh
+++ b/features/src/cuda/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/gcc/common/install.sh b/features/src/gcc/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/gcc/common/install.sh
+++ b/features/src/gcc/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/gitlab-cli/common/install.sh b/features/src/gitlab-cli/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/gitlab-cli/common/install.sh
+++ b/features/src/gitlab-cli/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/llvm/common/install.sh b/features/src/llvm/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/llvm/common/install.sh
+++ b/features/src/llvm/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/mambaforge/common/install.sh b/features/src/mambaforge/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/mambaforge/common/install.sh
+++ b/features/src/mambaforge/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/ninja/common/install.sh b/features/src/ninja/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/ninja/common/install.sh
+++ b/features/src/ninja/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/nvhpc/common/install.sh b/features/src/nvhpc/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/nvhpc/common/install.sh
+++ b/features/src/nvhpc/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/oneapi/common/install.sh b/features/src/oneapi/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/oneapi/common/install.sh
+++ b/features/src/oneapi/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/rapids-build-utils/common/install.sh b/features/src/rapids-build-utils/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/rapids-build-utils/common/install.sh
+++ b/features/src/rapids-build-utils/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/rust/common/install.sh b/features/src/rust/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/rust/common/install.sh
+++ b/features/src/rust/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/sccache/common/install.sh b/features/src/sccache/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/sccache/common/install.sh
+++ b/features/src/sccache/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/ucx/common/install.sh b/features/src/ucx/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/ucx/common/install.sh
+++ b/features/src/ucx/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env
diff --git a/features/src/utils/common/install.sh b/features/src/utils/common/install.sh
index 9500eaa77..e0c01961d 100755
--- a/features/src/utils/common/install.sh
+++ b/features/src/utils/common/install.sh
@@ -12,6 +12,8 @@ src="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # shellcheck disable=SC1091
 source "$src/utilities.sh";
 
+rm -f /etc/profile.d/00-restore-env.sh;
+
 # install /etc/skel
 cp -r "$src/etc/skel" /etc/;
 # install /etc/bash.bash_env

From 1f262565235ce9f369a4b4f7ce87740213c8ae7f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 4 Feb 2024 22:36:27 -0800
Subject: [PATCH 107/217] login to dockerhub so we don't hit rate limits

---
 .github/workflows/build-and-test-feature.yml        |  6 ++++++
 .../workflows/build-test-and-push-linux-image.yml   |  6 ++++++
 .../workflows/build-test-and-push-windows-image.yml | 13 ++++++-------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-and-test-feature.yml b/.github/workflows/build-and-test-feature.yml
index fcca147d8..e94ae0896 100644
--- a/.github/workflows/build-and-test-feature.yml
+++ b/.github/workflows/build-and-test-feature.yml
@@ -25,6 +25,12 @@ jobs:
         with:
           persist-credentials: false
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
+          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
+
       - name: ${{ inputs.name }}
         uses: ./.github/actions/build-and-test-feature
         with:
diff --git a/.github/workflows/build-test-and-push-linux-image.yml b/.github/workflows/build-test-and-push-linux-image.yml
index ad4ae47d9..2b267a00e 100644
--- a/.github/workflows/build-test-and-push-linux-image.yml
+++ b/.github/workflows/build-test-and-push-linux-image.yml
@@ -51,6 +51,12 @@ jobs:
           features: "${{ inputs.features }}"
           container_env: "${{ inputs.container_env }}"
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
+          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
+
       - name: Build ${{ steps.json.outputs.tag }}-${{ matrix.arch }}
         uses: ./.github/actions/build-linux-image
         with:
diff --git a/.github/workflows/build-test-and-push-windows-image.yml b/.github/workflows/build-test-and-push-windows-image.yml
index 35eacdbe9..69a9d4f57 100644
--- a/.github/workflows/build-test-and-push-windows-image.yml
+++ b/.github/workflows/build-test-and-push-windows-image.yml
@@ -59,6 +59,12 @@ jobs:
           tag=${version}-cuda${cuda}-cl${cl}-${{ inputs.os }}${{ matrix.edition }}
           EOF
 
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
+          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
+
       - name: Build ${{ steps.info.outputs.tag }}
         uses: ./.github/actions/build-windows-image
         with:
@@ -79,13 +85,6 @@ jobs:
           version: "${{ steps.info.outputs.version }}"
           edition: "${{ matrix.edition }}"
 
-      - if: inputs.push == 'true'
-        name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.GPUCIBOT_DOCKERHUB_USER }}
-          password: ${{ secrets.GPUCIBOT_DOCKERHUB_TOKEN }}
-
       - if: inputs.push == 'true'
         name: Push ${{ steps.info.outputs.tag }}
         shell: powershell

From 09b3e0327883605b5de38f0c9d2b6ee9168e54b5 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sun, 4 Feb 2024 22:47:20 -0800
Subject: [PATCH 108/217] pass in runner_env as input

---
 .../actions/build-and-test-feature/action.yml |  3 +++
 .github/actions/build-linux-image/action.yml  | 18 ++++++----------
 .github/actions/setup-runner-env/action.yml   | 21 ++++++++++++-------
 .github/workflows/build-and-test-feature.yml  |  1 +
 .../build-test-and-push-linux-image.yml       |  1 +
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.github/actions/build-and-test-feature/action.yml b/.github/actions/build-and-test-feature/action.yml
index d844418c7..cd05342cf 100644
--- a/.github/actions/build-and-test-feature/action.yml
+++ b/.github/actions/build-and-test-feature/action.yml
@@ -6,6 +6,7 @@ inputs:
   args: {type: string, required: true}
   gh_token: {type: string, defaut: '', required: false}
   vault_host: {type: string, defaut: '', required: false}
+  runner_env: {type: string, default: '', required: false}
   rw_sccache_bucket: {type: string, defaut: '', required: false}
   rw_sccache_region: {type: string, defaut: '', required: false}
   ro_sccache_bucket: {type: string, defaut: '', required: false}
@@ -16,6 +17,8 @@ runs:
   steps:
     - name: Setup runner environment
       uses: ./.github/actions/setup-runner-env
+      with:
+        runner_env: ${{ inputs.runner_env }}
 
     - name: Copy common scripts into features
       uses: ./.github/actions/copy-common-scripts
diff --git a/.github/actions/build-linux-image/action.yml b/.github/actions/build-linux-image/action.yml
index 0fa943876..5b1847807 100644
--- a/.github/actions/build-linux-image/action.yml
+++ b/.github/actions/build-linux-image/action.yml
@@ -3,18 +3,10 @@ name: build-image
 description: Build Linux image
 
 inputs:
-  tag:
-    type: string
-    required: true
-    description: Image tag
-  arch:
-    type: string
-    required: true
-    description: Image arch
-  repo:
-    type: string
-    required: true
-    description: Image repo
+  runner_env: {type: string, default: '', required: false}
+  tag: {type: string, required: true, description: Image tag}
+  arch: {type: string, required: true, description: Image arch}
+  repo: {type: string, required: true, description: Image repo}
 
 runs:
   using: composite
@@ -22,6 +14,8 @@ runs:
 
     - name: Setup runner environment
       uses: ./.github/actions/setup-runner-env
+      with:
+        runner_env: ${{ inputs.runner_env }}
 
     - name: Copy common scripts into features
       uses: ./.github/actions/copy-common-scripts
diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml
index ae701557f..35e236edc 100644
--- a/.github/actions/setup-runner-env/action.yml
+++ b/.github/actions/setup-runner-env/action.yml
@@ -2,33 +2,38 @@ name: setup-runner-env
 
 description: Setup self-hosted runner environment
 
+inputs:
+  runner_env: {type: string, default: '', required: false}
+
 runs:
   using: composite
   steps:
-    - name: Dump env
+    - name: Dump environment
       shell: bash -eo pipefail {0}
-      run: echo "${{ toJSON(env) }}"
+      run: |
+        echo "env: ${{ toJSON(env) }}"
+        echo "inputs.runner_env: "${{ inputs.runner_env }}""
 
-    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
+    - if: inputs.runner_env != 'self-hosted'
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
+    - if: inputs.runner_env == 'self-hosted'
       name: Setup self-hosted runner environment
       shell: bash -eo pipefail {0}
       run: |
         echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV;
         echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV;
 
-    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
+    - if: inputs.runner_env == 'self-hosted'
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
+    - if: inputs.runner_env != 'self-hosted'
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
@@ -36,14 +41,14 @@ runs:
       shell: bash
       run: docker context create builder
 
-    - if: env.RUNNER_ENVIRONMENT != 'self-hosted'
+    - if: inputs.runner_env != 'self-hosted'
       name: Setup docker buildx on github-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
         buildkitd-flags: --debug
         endpoint: builder
 
-    - if: env.RUNNER_ENVIRONMENT == 'self-hosted'
+    - if: inputs.runner_env == 'self-hosted'
       name: Setup docker buildx on self-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
diff --git a/.github/workflows/build-and-test-feature.yml b/.github/workflows/build-and-test-feature.yml
index e94ae0896..9330ae79d 100644
--- a/.github/workflows/build-and-test-feature.yml
+++ b/.github/workflows/build-and-test-feature.yml
@@ -35,6 +35,7 @@ jobs:
         uses: ./.github/actions/build-and-test-feature
         with:
           args: "${{ inputs.args }}"
+          runner_env: "${{ env.RUNNER_ENVIRONMENT }}"
           gh_token: "${{ secrets.GIST_REPO_READ_ORG_GITHUB_TOKEN }}"
           vault_host: "${{ secrets.GIST_REPO_READ_ORG_GITHUB_TOKEN && 'https://vault.ops.k8s.rapids.ai' || '' }}"
           rw_sccache_bucket: "${{ secrets.GIST_REPO_READ_ORG_GITHUB_TOKEN && 'rapids-sccache-devs' || '' }}"
diff --git a/.github/workflows/build-test-and-push-linux-image.yml b/.github/workflows/build-test-and-push-linux-image.yml
index 2b267a00e..606120297 100644
--- a/.github/workflows/build-test-and-push-linux-image.yml
+++ b/.github/workflows/build-test-and-push-linux-image.yml
@@ -63,6 +63,7 @@ jobs:
           arch: "${{ matrix.arch }}"
           repo: "${{ inputs.repo }}"
           tag: "${{ steps.json.outputs.tag }}"
+          runner_env: "${{ env.RUNNER_ENVIRONMENT }}"
 
       - if: inputs.push == 'true'
         name: Upload ${{ steps.json.outputs.tag }}-${{ matrix.arch }}

From 9da6ee8168a85c993e97a3e83b7d91454ee82a23 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 5 Feb 2024 10:09:07 -0800
Subject: [PATCH 109/217] check runner.name again

---
 .../actions/build-and-test-feature/action.yml   |  3 ---
 .github/actions/build-linux-image/action.yml    |  3 ---
 .github/actions/devcontainer-json/action.yml    |  2 +-
 .github/actions/setup-runner-env/action.yml     | 17 +++++++----------
 .github/workflows/build-and-test-feature.yml    |  1 -
 .../build-test-and-push-linux-image.yml         |  1 -
 6 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.github/actions/build-and-test-feature/action.yml b/.github/actions/build-and-test-feature/action.yml
index cd05342cf..d844418c7 100644
--- a/.github/actions/build-and-test-feature/action.yml
+++ b/.github/actions/build-and-test-feature/action.yml
@@ -6,7 +6,6 @@ inputs:
   args: {type: string, required: true}
   gh_token: {type: string, defaut: '', required: false}
   vault_host: {type: string, defaut: '', required: false}
-  runner_env: {type: string, default: '', required: false}
   rw_sccache_bucket: {type: string, defaut: '', required: false}
   rw_sccache_region: {type: string, defaut: '', required: false}
   ro_sccache_bucket: {type: string, defaut: '', required: false}
@@ -17,8 +16,6 @@ runs:
   steps:
     - name: Setup runner environment
       uses: ./.github/actions/setup-runner-env
-      with:
-        runner_env: ${{ inputs.runner_env }}
 
     - name: Copy common scripts into features
       uses: ./.github/actions/copy-common-scripts
diff --git a/.github/actions/build-linux-image/action.yml b/.github/actions/build-linux-image/action.yml
index 5b1847807..16deaed2f 100644
--- a/.github/actions/build-linux-image/action.yml
+++ b/.github/actions/build-linux-image/action.yml
@@ -3,7 +3,6 @@ name: build-image
 description: Build Linux image
 
 inputs:
-  runner_env: {type: string, default: '', required: false}
   tag: {type: string, required: true, description: Image tag}
   arch: {type: string, required: true, description: Image arch}
   repo: {type: string, required: true, description: Image repo}
@@ -14,8 +13,6 @@ runs:
 
     - name: Setup runner environment
       uses: ./.github/actions/setup-runner-env
-      with:
-        runner_env: ${{ inputs.runner_env }}
 
     - name: Copy common scripts into features
       uses: ./.github/actions/copy-common-scripts
diff --git a/.github/actions/devcontainer-json/action.yml b/.github/actions/devcontainer-json/action.yml
index e7824577d..984fc83f5 100644
--- a/.github/actions/devcontainer-json/action.yml
+++ b/.github/actions/devcontainer-json/action.yml
@@ -21,7 +21,7 @@ runs:
   using: composite
   steps:
 
-    - if: env.RUNNER_ENVIRONMENT != 'github-hosted'
+    - if: contains(runner.name, "GitHub Actions") == false
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml
index 35e236edc..0bd669489 100644
--- a/.github/actions/setup-runner-env/action.yml
+++ b/.github/actions/setup-runner-env/action.yml
@@ -2,9 +2,6 @@ name: setup-runner-env
 
 description: Setup self-hosted runner environment
 
-inputs:
-  runner_env: {type: string, default: '', required: false}
-
 runs:
   using: composite
   steps:
@@ -12,28 +9,28 @@ runs:
       shell: bash -eo pipefail {0}
       run: |
         echo "env: ${{ toJSON(env) }}"
-        echo "inputs.runner_env: "${{ inputs.runner_env }}""
+        echo "runner: '${{ toJSON(runner) }}'"
 
-    - if: inputs.runner_env != 'self-hosted'
+    - if: contains(runner.name, "GitHub Actions") == true
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: inputs.runner_env == 'self-hosted'
+    - if: contains(runner.name, "GitHub Actions") == false
       name: Setup self-hosted runner environment
       shell: bash -eo pipefail {0}
       run: |
         echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV;
         echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV;
 
-    - if: inputs.runner_env == 'self-hosted'
+    - if: contains(runner.name, "GitHub Actions") == false
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: inputs.runner_env != 'self-hosted'
+    - if: contains(runner.name, "GitHub Actions") == true
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
@@ -41,14 +38,14 @@ runs:
       shell: bash
       run: docker context create builder
 
-    - if: inputs.runner_env != 'self-hosted'
+    - if: contains(runner.name, "GitHub Actions") == true
       name: Setup docker buildx on github-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
         buildkitd-flags: --debug
         endpoint: builder
 
-    - if: inputs.runner_env == 'self-hosted'
+    - if: contains(runner.name, "GitHub Actions") == false
       name: Setup docker buildx on self-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
diff --git a/.github/workflows/build-and-test-feature.yml b/.github/workflows/build-and-test-feature.yml
index 9330ae79d..e94ae0896 100644
--- a/.github/workflows/build-and-test-feature.yml
+++ b/.github/workflows/build-and-test-feature.yml
@@ -35,7 +35,6 @@ jobs:
         uses: ./.github/actions/build-and-test-feature
         with:
           args: "${{ inputs.args }}"
-          runner_env: "${{ env.RUNNER_ENVIRONMENT }}"
           gh_token: "${{ secrets.GIST_REPO_READ_ORG_GITHUB_TOKEN }}"
           vault_host: "${{ secrets.GIST_REPO_READ_ORG_GITHUB_TOKEN && 'https://vault.ops.k8s.rapids.ai' || '' }}"
           rw_sccache_bucket: "${{ secrets.GIST_REPO_READ_ORG_GITHUB_TOKEN && 'rapids-sccache-devs' || '' }}"
diff --git a/.github/workflows/build-test-and-push-linux-image.yml b/.github/workflows/build-test-and-push-linux-image.yml
index 606120297..2b267a00e 100644
--- a/.github/workflows/build-test-and-push-linux-image.yml
+++ b/.github/workflows/build-test-and-push-linux-image.yml
@@ -63,7 +63,6 @@ jobs:
           arch: "${{ matrix.arch }}"
           repo: "${{ inputs.repo }}"
           tag: "${{ steps.json.outputs.tag }}"
-          runner_env: "${{ env.RUNNER_ENVIRONMENT }}"
 
       - if: inputs.push == 'true'
         name: Upload ${{ steps.json.outputs.tag }}-${{ matrix.arch }}

From 9ec8d40ae9f1e3d53ac7bcd1c2e9f94d3ae9c356 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 5 Feb 2024 10:14:31 -0800
Subject: [PATCH 110/217] fix quoting

---
 .github/actions/devcontainer-json/action.yml |  2 +-
 .github/actions/setup-runner-env/action.yml  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/actions/devcontainer-json/action.yml b/.github/actions/devcontainer-json/action.yml
index 984fc83f5..d5484c0e5 100644
--- a/.github/actions/devcontainer-json/action.yml
+++ b/.github/actions/devcontainer-json/action.yml
@@ -21,7 +21,7 @@ runs:
   using: composite
   steps:
 
-    - if: contains(runner.name, "GitHub Actions") == false
+    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml
index 0bd669489..975675d7b 100644
--- a/.github/actions/setup-runner-env/action.yml
+++ b/.github/actions/setup-runner-env/action.yml
@@ -11,26 +11,26 @@ runs:
         echo "env: ${{ toJSON(env) }}"
         echo "runner: '${{ toJSON(runner) }}'"
 
-    - if: contains(runner.name, "GitHub Actions") == true
+    - if: ${{ contains(runner.name, 'GitHub Actions') == true }}
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: contains(runner.name, "GitHub Actions") == false
+    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
       name: Setup self-hosted runner environment
       shell: bash -eo pipefail {0}
       run: |
         echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV;
         echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV;
 
-    - if: contains(runner.name, "GitHub Actions") == false
+    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: contains(runner.name, "GitHub Actions") == true
+    - if: ${{ contains(runner.name, 'GitHub Actions') == true }}
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
@@ -38,14 +38,14 @@ runs:
       shell: bash
       run: docker context create builder
 
-    - if: contains(runner.name, "GitHub Actions") == true
+    - if: ${{ contains(runner.name, 'GitHub Actions') == true }}
       name: Setup docker buildx on github-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
         buildkitd-flags: --debug
         endpoint: builder
 
-    - if: contains(runner.name, "GitHub Actions") == false
+    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
       name: Setup docker buildx on self-hosted runners
       uses: docker/setup-buildx-action@v2
       with:

From 30dacede64300c8f06d352146233ce63452e7f7f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 5 Feb 2024 12:41:16 -0800
Subject: [PATCH 111/217] use ssh URLs in fallback

---
 .../src/utils/opt/devcontainer/bin/github/repo/clone.sh  | 9 +++++++--
 .../src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh  | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index b8b4ea4ce..883bfe93b 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -156,8 +156,13 @@ clone_github_repo() {
             upstream="$(get_repo_git_url "${upstream}")";
         fi
     else
-        origin="https://${GITHUB_HOST:-github.com}/${origin}.git";
-        upstream="https://${GITHUB_HOST:-github.com}/${upstream}.git";
+        if [ "$(gh config get git_protocol)" = "ssh" ]; then
+            origin="git@${GITHUB_HOST:-github.com}:${origin}.git";
+            upstream="git@${GITHUB_HOST:-github.com}:${upstream}.git";
+        else
+            origin="https://${GITHUB_HOST:-github.com}/${origin}.git";
+            upstream="https://${GITHUB_HOST:-github.com}/${upstream}.git";
+        fi
     fi
 
     devcontainer-utils-clone-git-repo         \
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index b227791d5..c72aae6cf 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -173,8 +173,13 @@ clone_gitlab_repo() {
             upstream="$(get_repo_git_url "${upstream}")";
         fi
     else
-        origin="https://${GITLAB_HOST:-gitlab.com}/${origin}.git";
-        upstream="https://${GITLAB_HOST:-gitlab.com}/${upstream}.git";
+        if [ "$(glab config get git_protocol)" = "ssh" ]; then
+            origin="git@${GITLAB_HOST:-gitlab.com}:${origin}.git";
+            upstream="git@${GITLAB_HOST:-gitlab.com}:${upstream}.git";
+        else
+            origin="https://${GITLAB_HOST:-gitlab.com}/${origin}.git";
+            upstream="https://${GITLAB_HOST:-gitlab.com}/${upstream}.git";
+        fi
     fi
 
     devcontainer-utils-clone-git-repo         \

From 9a4ad1f82d3550387407919126b6bb135c0c1543 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 5 Feb 2024 15:30:39 -0800
Subject: [PATCH 112/217] use runner.environment

---
 .github/actions/devcontainer-json/action.yml |  2 +-
 .github/actions/setup-runner-env/action.yml  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/actions/devcontainer-json/action.yml b/.github/actions/devcontainer-json/action.yml
index d5484c0e5..43bcd4e66 100644
--- a/.github/actions/devcontainer-json/action.yml
+++ b/.github/actions/devcontainer-json/action.yml
@@ -21,7 +21,7 @@ runs:
   using: composite
   steps:
 
-    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
+    - if: runner.environment == 'self-hosted'
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
diff --git a/.github/actions/setup-runner-env/action.yml b/.github/actions/setup-runner-env/action.yml
index 975675d7b..25ee831dd 100644
--- a/.github/actions/setup-runner-env/action.yml
+++ b/.github/actions/setup-runner-env/action.yml
@@ -11,26 +11,26 @@ runs:
         echo "env: ${{ toJSON(env) }}"
         echo "runner: '${{ toJSON(runner) }}'"
 
-    - if: ${{ contains(runner.name, 'GitHub Actions') == true }}
+    - if: runner.environment != 'self-hosted'
       name: Free up disk space
       uses: ./.github/actions/free-disk-space
       with:
         tool_cache: "${{ runner.tool_cache }}"
 
-    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
+    - if: runner.environment == 'self-hosted'
       name: Setup self-hosted runner environment
       shell: bash -eo pipefail {0}
       run: |
         echo "HOME=${{ runner.workspace }}" >> $GITHUB_ENV;
         echo "TMPDIR=${{ runner.temp }}" >> $GITHUB_ENV;
 
-    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
+    - if: runner.environment == 'self-hosted'
       name: Setup Node.js
       uses: actions/setup-node@v3
       with:
         node-version: '16'
 
-    - if: ${{ contains(runner.name, 'GitHub Actions') == true }}
+    - if: runner.environment != 'self-hosted'
       name: Set up QEMU
       uses: docker/setup-qemu-action@v2
 
@@ -38,14 +38,14 @@ runs:
       shell: bash
       run: docker context create builder
 
-    - if: ${{ contains(runner.name, 'GitHub Actions') == true }}
+    - if: runner.environment != 'self-hosted'
       name: Setup docker buildx on github-hosted runners
       uses: docker/setup-buildx-action@v2
       with:
         buildkitd-flags: --debug
         endpoint: builder
 
-    - if: ${{ contains(runner.name, 'GitHub Actions') == false }}
+    - if: runner.environment == 'self-hosted'
       name: Setup docker buildx on self-hosted runners
       uses: docker/setup-buildx-action@v2
       with:

From 50e68f0344e581696b55b60fd26d3ff1ed29ac89 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 6 Feb 2024 17:02:15 -0800
Subject: [PATCH 113/217] add devcontainer-utils-post-create-command that uses
 socat to proxy to SSH_AUTH_SOCK

---
 features/src/utils/devcontainer-feature.json  |  6 +++-
 features/src/utils/install.sh                 |  2 ++
 .../devcontainer/bin/post-create-command.sh   | 30 ++++++++++++++++
 .../opt/devcontainer/bin/update-envvars.sh    | 30 ++++++++++++++++
 .../bin/vault/s3/creds/persist.sh             | 34 +++----------------
 5 files changed, 72 insertions(+), 30 deletions(-)
 create mode 100755 features/src/utils/opt/devcontainer/bin/post-create-command.sh
 create mode 100755 features/src/utils/opt/devcontainer/bin/update-envvars.sh

diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index 7a251f2f7..2e62b95de 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -7,7 +7,11 @@
     "BASH_ENV": "/etc/bash.bash_env"
   },
   "postCreateCommand": [
-    "/bin/bash", "-c", "if ! test -f /var/run/crond.pid; then cron 2>/dev/null || true; fi"
+    "/bin/bash",
+    "-li",
+    "+o",
+    "history",
+    "devcontainer-utils-post-create-command"
   ],
   "postAttachCommand": [
     "/bin/bash",
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index d83179622..91a11b7df 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -13,6 +13,7 @@ check_packages      \
     curl            \
     sudo            \
     wget            \
+    socat           \
     tzdata          \
     gettext-base    \
     openssh-client  \
@@ -83,6 +84,7 @@ update-alternatives --install /usr/bin/devcontainer-utils-generate-bash-completi
 devcontainer-utils-generate-bash-completion --command devcontainer-utils-generate-bash-completion --out-dir /etc/bash_completion.d;
 
 install_utility shell-is-interactive shell-is-interactive.sh;
+install_utility post-create-command post-create-command.sh;
 install_utility post-attach-command post-attach-command.sh;
 install_utility post-attach-command-entrypoint post-attach-command-entrypoint.sh;
 install_utility python-repl-startup python-repl-startup.py;
diff --git a/features/src/utils/opt/devcontainer/bin/post-create-command.sh b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
new file mode 100755
index 000000000..03041f118
--- /dev/null
+++ b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -e;
+
+# Start crond if it isn't already started
+if ! test -f /var/run/crond.pid; then
+    cron 2>/dev/null || true;
+fi
+
+# If SSH_AUTH_SOCK exists and isn't owned by the coder user, use socat to proxy
+# between a socket owned by the coder user and the one mounted in from the host
+if test -n "${SSH_AUTH_SOCK}" \
+&& test "$(stat -c "%u:%g" "${SSH_AUTH_SOCK}")" != "$(id -u):$(id -g)"; then
+    # shellcheck disable=SC1091
+    . "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/update-envvars.sh";
+    reset_envvar SSH_AUTH_SOCK;
+    ssh_auth_sock=~/.ssh/socket;
+    # If the remapped ssh socket doesn't already exist
+    if ! test -f "${ssh_auth_sock}"; then
+        # Map the host's ssh-agent socket to one owned by coder
+        sudo --background socat "UNIX-LISTEN:${ssh_auth_sock},fork,user=$(id -nu),group=$(id -ng),mode=777" "UNIX-CONNECT:${SSH_AUTH_SOCK}";
+        sleep 5;
+    fi
+    # test the remapped ssh-agent socket
+    SSH_AUTH_SOCK="${ssh_auth_sock}" ssh-add -L 1>&2;
+    # set SSH_AUTH_SOCK to the new remapped one
+    export_envvar SSH_AUTH_SOCK "${ssh_auth_sock}";
+    export SSH_AUTH_SOCK="${ssh_auth_sock}";
+    unset ssh_auth_sock;
+fi
diff --git a/features/src/utils/opt/devcontainer/bin/update-envvars.sh b/features/src/utils/opt/devcontainer/bin/update-envvars.sh
new file mode 100755
index 000000000..711eced83
--- /dev/null
+++ b/features/src/utils/opt/devcontainer/bin/update-envvars.sh
@@ -0,0 +1,30 @@
+#! /usr/bin/env bash
+
+export_envvar() {
+    if [ -n "${1:-}" ]; then
+        for file in ~/.bashrc /etc/profile.d/*-devcontainer-utils.sh; do
+            echo "export ${1}=\"${2:-}\";" | sudo tee -a "${file}" >/dev/null;
+        done;
+    fi
+}
+
+unset_envvar() {
+    if [ -n "${1:-}" ]; then
+        for file in ~/.bashrc /etc/profile.d/*-devcontainer-utils.sh; do
+            echo "unset ${1};" | sudo tee -a "${file}" >/dev/null;
+        done;
+    fi
+}
+
+reset_envvar() {
+    if [ -n "${1:-}" ]; then
+        for file in ~/.bashrc /etc/profile.d/*-devcontainer-utils.sh; do
+            if grep -q -E "^unset ${1};\$" "${file}"; then
+                sudo sed -Ei "/^unset ${1};\$/d" "${file}";
+            fi
+            if grep -q -E "^export ${1}=.*$" "${file}"; then
+                sudo sed -Ei "/^export ${1}=.*\$/d" "${file}";
+            fi
+        done
+    fi
+}
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index 77c73da1e..83daf65f8 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -28,34 +28,8 @@
 #  --aws-secret-access-key <key>  Set the $AWS_SECRET_ACCESS_KEY environment variable for all shells to <key> and persist in ~/.aws/credentials.
 #                                 (default: none)
 
-export_envvar() {
-    if [ -n "${1:-}" ]; then
-        for file in ~/.bashrc /etc/profile.d/*-devcontainer-utils.sh; do
-            echo "export ${1}=\"${2:-}\";" | sudo tee -a "${file}" >/dev/null;
-        done;
-    fi
-}
-
-unset_envvar() {
-    if [ -n "${1:-}" ]; then
-        for file in ~/.bashrc /etc/profile.d/*-devcontainer-utils.sh; do
-            echo "unset ${1};" | sudo tee -a "${file}" >/dev/null;
-        done;
-    fi
-}
-
-reset_envvar() {
-    if [ -n "${1:-}" ]; then
-        for file in ~/.bashrc /etc/profile.d/*-devcontainer-utils.sh; do
-            if grep -q -E "^unset ${1};\$" "${file}"; then
-                sudo sed -Ei "/^unset ${1};\$/d" "${file}";
-            fi
-            if grep -q -E "^export ${1}=.*$" "${file}"; then
-                sudo sed -Ei "/^export ${1}=.*\$/d" "${file}";
-            fi
-        done
-    fi
-}
+# shellcheck disable=SC1091
+. "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/../../../update-envvars.sh";
 
 persist_s3_creds() {
     local -;
@@ -142,4 +116,6 @@ ____________EOF
     fi
 }
 
-persist_s3_creds "$@";
+if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = devcontainer-utils-vault-s3-creds-persist ]; then
+    persist_s3_creds "$@";
+fi

From 17bef73d6ae351af6d3c85fed438ec32b1671f0b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 7 Feb 2024 16:26:11 -0800
Subject: [PATCH 114/217] fix counting in add_etc_profile_d_script

---
 features/common/utilities.sh                        | 3 ++-
 features/src/cccl-dev/common/utilities.sh           | 3 ++-
 features/src/cmake/common/utilities.sh              | 3 ++-
 features/src/cuda/common/utilities.sh               | 3 ++-
 features/src/gcc/common/utilities.sh                | 3 ++-
 features/src/gitlab-cli/common/utilities.sh         | 3 ++-
 features/src/llvm/common/utilities.sh               | 3 ++-
 features/src/mambaforge/common/utilities.sh         | 3 ++-
 features/src/ninja/common/utilities.sh              | 3 ++-
 features/src/nvhpc/common/utilities.sh              | 3 ++-
 features/src/oneapi/common/utilities.sh             | 3 ++-
 features/src/rapids-build-utils/common/utilities.sh | 3 ++-
 features/src/rust/common/utilities.sh               | 3 ++-
 features/src/sccache/common/utilities.sh            | 3 ++-
 features/src/ucx/common/utilities.sh                | 3 ++-
 features/src/utils/common/utilities.sh              | 3 ++-
 16 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/features/common/utilities.sh b/features/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/common/utilities.sh
+++ b/features/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/cccl-dev/common/utilities.sh b/features/src/cccl-dev/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/cccl-dev/common/utilities.sh
+++ b/features/src/cccl-dev/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/cmake/common/utilities.sh b/features/src/cmake/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/cmake/common/utilities.sh
+++ b/features/src/cmake/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/cuda/common/utilities.sh b/features/src/cuda/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/cuda/common/utilities.sh
+++ b/features/src/cuda/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/gcc/common/utilities.sh b/features/src/gcc/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/gcc/common/utilities.sh
+++ b/features/src/gcc/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/gitlab-cli/common/utilities.sh b/features/src/gitlab-cli/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/gitlab-cli/common/utilities.sh
+++ b/features/src/gitlab-cli/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/llvm/common/utilities.sh b/features/src/llvm/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/llvm/common/utilities.sh
+++ b/features/src/llvm/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/mambaforge/common/utilities.sh b/features/src/mambaforge/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/mambaforge/common/utilities.sh
+++ b/features/src/mambaforge/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/ninja/common/utilities.sh b/features/src/ninja/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/ninja/common/utilities.sh
+++ b/features/src/ninja/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/nvhpc/common/utilities.sh b/features/src/nvhpc/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/nvhpc/common/utilities.sh
+++ b/features/src/nvhpc/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/oneapi/common/utilities.sh b/features/src/oneapi/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/oneapi/common/utilities.sh
+++ b/features/src/oneapi/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/rapids-build-utils/common/utilities.sh b/features/src/rapids-build-utils/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/rapids-build-utils/common/utilities.sh
+++ b/features/src/rapids-build-utils/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/rust/common/utilities.sh b/features/src/rust/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/rust/common/utilities.sh
+++ b/features/src/rust/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/sccache/common/utilities.sh b/features/src/sccache/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/sccache/common/utilities.sh
+++ b/features/src/sccache/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/ucx/common/utilities.sh b/features/src/ucx/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/ucx/common/utilities.sh
+++ b/features/src/ucx/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }
diff --git a/features/src/utils/common/utilities.sh b/features/src/utils/common/utilities.sh
index 3599982a3..89879e7bf 100644
--- a/features/src/utils/common/utilities.sh
+++ b/features/src/utils/common/utilities.sh
@@ -123,7 +123,8 @@ prepend_to_etc_zshrc() {
 export -f prepend_to_etc_zshrc;
 
 add_etc_profile_d_script() {
-    local name="$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-${1}.sh";
+    # shellcheck disable=SC2012
+    local name="$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-${1}.sh";
     echo -e "#! /usr/bin/env bash\n${*:2}" > "/etc/profile.d/${name}";
     chmod +x "/etc/profile.d/${name}";
 }

From d27ffd635ea1d4206ec41007863744f8c2c2d8d2 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 8 Feb 2024 01:14:20 -0800
Subject: [PATCH 115/217] make build dirs per python package manager/cuda
 version, and build type

---
 features/src/rapids-build-utils/install.sh    |   4 +-
 .../bin/generate-scripts.sh                   |  17 ++-
 .../bin/get-cmake-build-dir.sh                |  45 ++++++
 .../bin/get-num-archs-jobs-and-load.sh        |   2 +-
 .../bin/parse-cmake-args.sh                   | 129 +++++++++++++++---
 .../bin/parse-cmake-build-type.sh             |   2 +-
 .../bin/parse-cmake-define.sh                 |  40 ++++++
 .../bin/parse-cmake-var-from-args.sh          |  15 --
 .../bin/parse-cmake-vars-from-args.sh         |  23 ----
 .../bin/tmpl/cpp.build.tmpl.sh                |   2 +-
 .../bin/tmpl/cpp.clean.tmpl.sh                |   2 +-
 .../bin/tmpl/cpp.configure.tmpl.sh            |  41 +++---
 .../bin/tmpl/cpp.cpack.tmpl.sh                |  38 +++---
 .../bin/tmpl/cpp.install.tmpl.sh              |   2 +-
 .../bin/tmpl/cpp.uninstall.tmpl.sh            |   4 +-
 .../bin/tmpl/python.build.editable.tmpl.sh    |  19 ++-
 .../bin/tmpl/python.build.wheel.tmpl.sh       |  17 ++-
 .../bin/tmpl/python.clean.tmpl.sh             |   9 +-
 .../bin/parse-args-from-docstring.sh          |  11 +-
 19 files changed, 294 insertions(+), 128 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-define.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 21869efe1..0653c00e2 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -58,6 +58,7 @@ install_utility checkout-same-branch;
 install_utility pull-repositories;
 install_utility push-repositories;
 install_utility generate-scripts;
+install_utility get-cmake-build-dir;
 install_utility make-conda-dependencies;
 install_utility make-conda-env;
 install_utility make-pip-dependencies;
@@ -65,8 +66,7 @@ install_utility make-pip-env;
 install_utility make-vscode-workspace;
 install_utility parse-cmake-args;
 install_utility parse-cmake-build-type;
-install_utility parse-cmake-var-from-args;
-install_utility parse-cmake-vars-from-args;
+install_utility parse-cmake-define;
 install_utility python-pkg-roots;
 install_utility python-pkg-names;
 install_utility python-conda-pkg-names;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 9a76bf774..095ce8089 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -82,6 +82,7 @@ generate_script() {
                       $PY_ENV
                       $PY_SRC
                       $PY_LIB
+                      $BIN_DIR
                       $CPP_LIB
                       $CPP_SRC
                       $CPP_ARGS
@@ -219,6 +220,7 @@ generate_scripts() {
     local k;
 
     local repo_names=();
+    local -r bin_dir="$(dirname "$(rapids-get-cmake-build-dir)")/latest";
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
@@ -253,7 +255,6 @@ generate_scripts() {
             cpp_dirs+=("${cpp_path}");
             cpp_libs+=("${!cpp_name:-}");
             cpp_name="${!cpp_name:-}";
-            # cpp_name_lower="${cpp_name,,}";
 
             cpp_name_to_path["${cpp_name}"]="${cpp_path}";
 
@@ -267,14 +268,15 @@ generate_scripts() {
                 fi
                 local dep_cpp_path="${cpp_name_to_path["${dep_cpp_name}"]}";
 
-                cpp_deps+=("-D${!dep}_ROOT=\"${dep_cpp_path}/build/latest\"");
-                cpp_deps+=("-D${!dep,,}_ROOT=\"${dep_cpp_path}/build/latest\"");
-                cpp_deps+=("-D${!dep^^}_ROOT=\"${dep_cpp_path}/build/latest\"");
+                cpp_deps+=("-D${!dep}_ROOT=\"${dep_cpp_path}/${bin_dir}\"");
+                cpp_deps+=("-D${!dep,,}_ROOT=\"${dep_cpp_path}/${bin_dir}\"");
+                cpp_deps+=("-D${!dep^^}_ROOT=\"${dep_cpp_path}/${bin_dir}\"");
                 deps+=("${cpp_deps[@]}");
             done
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
                 SRC_PATH=~/"${!repo_path:-}" \
+                BIN_DIR="${bin_dir}"         \
                 CPP_LIB="${cpp_name:-}"      \
                 CPP_SRC="${!cpp_sub_dir:-}"  \
                 CPP_ARGS="${!cpp_args:-}"    \
@@ -294,9 +296,9 @@ generate_scripts() {
             args+=("-DFIND_${cpp_lib}_CPP=ON");
             args+=("-DFIND_${cpp_lib,,}_CPP=ON");
             args+=("-DFIND_${cpp_lib^^}_CPP=ON");
-            deps+=("-D${cpp_lib}_ROOT=\"${cpp_dir}/build/latest\"");
-            deps+=("-D${cpp_lib,,}_ROOT=\"${cpp_dir}/build/latest\"");
-            deps+=("-D${cpp_lib^^}_ROOT=\"${cpp_dir}/build/latest\"");
+            deps+=("-D${cpp_lib}_ROOT=\"${cpp_dir}/${bin_dir}\"");
+            deps+=("-D${cpp_lib,,}_ROOT=\"${cpp_dir}/${bin_dir}\"");
+            deps+=("-D${cpp_lib^^}_ROOT=\"${cpp_dir}/${bin_dir}\"");
         done
 
         for ((j=0; j < ${!py_length:-0}; j+=1)); do
@@ -313,6 +315,7 @@ generate_scripts() {
             py_libs+=("${!py_name}");
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
+                BIN_DIR="${bin_dir}"                      \
                 SRC_PATH=~/"${!repo_path:-}"              \
                 PY_SRC="${py_path}"                       \
                 PY_LIB="${!py_name}"                      \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
new file mode 100755
index 000000000..ebc403ddc
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-get-cmake-build-dir <source_path> [cmake_args]...
+#
+# Build a path to the build directory for a C++ or scikit-build-core Python library.
+# If the <source_path> is not null and a valid directory, retarget the `build/(pip|conda)/cuda-X.Y.Z/latest` symlink
+# to point to the fully resolved build dir path.
+#
+# The build dir path includes components for:
+# * PYTHON_PACKAGE_MANAGER envvar (if set)
+# * CUDA Toolkit version (if set)
+# * the CMake build type
+#
+# This allows users to persist C++ and Python builds per [package manager] x [CUDA Toolkit] x [build type] combination,
+# meaning they don't need to do a clean build if switching between devcontainers or build types.
+#
+# Positional arguments:
+# source_path      The C++ or Python project source path
+# [cmake_args]...  The list of CMake arguments to search for the CMAKE_BUILD_TYPE
+
+get_cmake_build_dir() {
+    local -;
+    set -euo pipefail;
+
+    local src="${1:-}";
+    if test $# -gt 0; then shift; fi;
+
+    local bin="build";
+    local -r type="$(rapids-parse-cmake-build-type "$@" <&0 | tr '[:upper:]' '[:lower:]')";
+    local -r cuda="$(grep -o '^[0-9]*.[0-9]*' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
+
+    bin+="${PYTHON_PACKAGE_MANAGER:+/${PYTHON_PACKAGE_MANAGER}}${cuda:+/cuda-${cuda}}";
+
+    if test -n "${src:-}" && test -d "${src:-}"; then
+        mkdir -p "${src}/${bin}";
+        (
+            cd "${src}/${bin}" || exit 1;
+            ln -sfn "${type}" latest;
+        );
+    fi
+    echo "${src:+${src}/}${bin}/${type}";
+}
+
+get_cmake_build_dir "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 9b256111b..6d8c67dbc 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -50,7 +50,7 @@ get_num_archs_jobs_and_load() {
 
     if test -z "${archs:-}" \
     && test -n "${INFER_NUM_DEVICE_ARCHITECTURES:-}"; then
-        archs=$(rapids-parse-cmake-var-from-args CMAKE_CUDA_ARCHITECTURES "${OPTS[@]}");
+        archs="$(rapids-parse-cmake-define CMAKE_CUDA_ARCHITECTURES "${OPTS[@]}" || echo)";
         archs="${archs:-${CMAKE_CUDA_ARCHITECTURES:-${CUDAARCHS:-}}}";
 
         case "${archs:-}" in
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
index a9ed295b9..abae71e35 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
@@ -1,29 +1,120 @@
 #!/usr/bin/env bash
 
+# Usage:
+#  rapids-parse-cmake-args [OPTION]...
+#
+# Filter an arguments list to the subset that CMake accepts.
+#
+# Boolean options:
+#  -h,--help                      Print usage information and exit.
+#  -H,--help                      Print usage information and exit.
+#  --debug-trycompile             Do not delete the try_compile build tree. Only useful on one try_compile at a time.
+#  --debug-output                 Put cmake in a debug mode.
+#  --debug-find                   Put cmake find in a debug mode.
+#  --fresh                        Configure a fresh build tree, removing any existing cache file.
+#  --find-package                 Legacy pkg-config like mode.  Do not use.
+#  --log-context                  Prepend log messages with context, if given
+#  --trace                        Put cmake in trace mode.
+#  --trace-expand                 Put cmake in trace mode with variable expansion.
+#  --warn-uninitialized           Warn about uninitialized values.
+#  --no-warn-unused-cli           Don't warn about command line options.
+#  --check-system-vars            Find problems with variable usage in system files.
+#  --compile-no-warning-as-error  Ignore COMPILE_WARNING_AS_ERROR property and CMAKE_COMPILE_WARNING_AS_ERROR variable.
+#
+# Options that require values:
+#  -S <path>                       Explicitly specify a source directory.
+#  -B <path>                       Explicitly specify a build directory.
+#  -C <path>                       Pre-load a script to populate the cache.
+#  -D <var>[:<type>]=<value>       Create or update a cmake cache entry.
+#  -U <globbing_expr>              Remove matching entries from CMake cache.
+#  -G <generator-name>             Specify a build system generator.
+#  -T <toolset-name>               Specify toolset name if supported by generator.
+#  -A <platform-name>              Specify platform name if supported by generator.
+#  --toolchain <file>              Specify toolchain file [CMAKE_TOOLCHAIN_FILE].
+#  --install-prefix <directory>    Specify install directory [CMAKE_INSTALL_PREFIX].
+#  -W (dev)                        Enable developer warnings.
+#  -W (no-dev)                     Suppress developer warnings.
+#  -W (deprecated)                 Enable deprecation warnings.
+#  -W (no-deprecated)              Suppress deprecation warnings.
+#  -W (error=dev)                  Make developer warnings errors.
+#  -W (no-error=dev)               Make developer warnings not errors.
+#  -W (error=deprecated)           Make deprecated macro and function warnings errors.
+#  -W (no-error=deprecated)        Make deprecated macro and function warnings not errors.
+#  --preset <preset>               Specify a configure preset.
+#  --graphviz <file>               Generate graphviz of dependencies, see CMakeGraphVizOptions.cmake for more.
+#  --loglevel,--log-level (ERROR|WARNING|NOTICE|STATUS|VERBOSE|DEBUG|TRACE)
+#                                  Set the verbosity of messages from CMake files. --loglevel is also accepted for backward compatibility reasons.
+#  --debug-find-pkg <pkg-name>     Limit cmake debug-find to the comma-separated list of packages
+#  --debug-find-var <var-name>     Limit cmake debug-find to the comma-separated list of result variables
+#  --trace-format (human|json-v1)  Set the output format of the trace.
+#  --trace-source <file>           Trace only this CMake file/module.  Multiple options allowed.
+#  --trace-redirect <file>         Redirect trace output to a file instead of stderr.
+#  --profiling-format <fmt>        Output data for profiling CMake scripts. Supported formats: google-trace
+#  --profiling-output <file>       Select an output path for the profiling data enabled through --profiling-format.
+
+# shellcheck disable=SC1091
+. devcontainer-utils-parse-args-from-docstring;
+
 parse_cmake_args() {
     local -;
     set -euo pipefail;
 
-    local ARG="";
-    local args=(-GNinja);
-    args+=(${CMAKE_ARGS:-});
-
-    while test -n "${1:-}"; do
-        ARG="${1:-}";
-        if [[ "$ARG" == -D ]]; then
-            shift;
-            if test -n "${1:-}"; then
-                ARG+="${1:-}";
-                args+=("$ARG");
-            fi
-            shift;
-            continue;
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-cmake-args"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
+    eval "$(devcontainer-utils-parse-args rapids-parse-cmake-args "$@" <&0)";
+
+    local -r usage="$(print_usage "$(realpath -m "${BASH_SOURCE[0]}")")";
+    local -ar long_bools="($(parse_bool_names_from_usage   <<< "${usage}" | parse_long_names))";
+    local -ar long_value="($(parse_value_names_from_usage  <<< "${usage}" | parse_long_names))";
+    local -ar short_bools="($(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names))";
+    local -ar short_value="($(parse_value_names_from_usage <<< "${usage}" | parse_short_names | grep -vP '(S|B|G|C|U|T|A)'))";
+
+    local k;
+    local cmake_args=();
+
+    for k in "${short_bools[@]}"; do
+        local -n v=${k//-/_};
+        if test -n "${v[*]:-}"; then
+            cmake_args+=("-${k}");
         fi
-        shift;
-        args+=("$(printf %q "${ARG}")");
-    done;
+    done
+    unset "${short_bools[@]//-/_}";
+
+    # short value options that might need spaces
+    for k in S B G C U T A; do
+        local -n v=${k//-/_};
+        cmake_args+=("${v[@]/#/-${k} }");
+    done
+    unset S B G C U T A;
+
+    # All other value opts should be fine w/o spaces
+    for k in "${short_value[@]}"; do
+        local -n v=${k//-/_};
+        cmake_args+=("${v[@]/#/-${k}}");
+    done
+    unset "${short_value[@]//-/_}";
+
+    for k in "${long_bools[@]}"; do
+        local -n v=${k//-/_};
+        if test -n "${v[*]:-}"; then
+            cmake_args+=("--${k}");
+        fi
+    done
+    unset "${long_bools[@]//-/_}";
+
+    for k in "${long_value[@]}"; do
+        local -n v=${k//-/_};
+        cmake_args+=("${v[@]/#/--${k}=}");
+    done
+    unset "${long_value[@]//-/_}";
 
-    echo "${args[@]}";
+    echo "${cmake_args[@]}";
 }
 
-parse_cmake_args "$@";
+parse_cmake_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
index 2963123d0..4ec6349df 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-rapids-parse-cmake-var-from-args CMAKE_BUILD_TYPE "$@";
+rapids-parse-cmake-define CMAKE_BUILD_TYPE "$@" <&0 || echo "Release";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-define.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-define.sh
new file mode 100755
index 000000000..59fa61721
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-define.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-parse-cmake-define <name> [cmake_args]...
+#
+# Finds the -D<name>=<val> definition from a list of input CMake arguments.
+# If -D<name>=<val> is found in <cmake_args>, <val> is printed to stdout.
+# Otherwise, nothing is printed and the script exits with an error code.
+#
+# Positional arguments:
+# name             The name of the CMake define to find
+# [cmake_args]...  The list of CMake arguments to search
+
+parse_cmake_define() {
+    local -;
+    set -euo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-cmake-define"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
+    local arg;
+    local val;
+    local def="$1"; shift;
+
+    eval "$(devcontainer-utils-parse-args <(echo -e "\n# -D <def>") "$@" <&0)";
+
+    for arg in "${D[@]}"; do
+        if test "${def}" = "${arg%=*}"; then
+            val="${arg#*=}";
+        fi
+    done
+    test -n "${val:-}" && echo "${val}";
+}
+
+parse_cmake_define "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
deleted file mode 100755
index feab3a8d1..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-var-from-args.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-parse_cmake_var_from_args() {
-    local -;
-    set -euo pipefail;
-
-    eval "$(                                       \
-        rapids-parse-cmake-vars-from-args "${@:2}" \
-      | xargs -r -d'\n' -I% echo -n export %\;     \
-    )";
-
-    envsubst "\$$1" <<< "\$$1";
-}
-
-parse_cmake_var_from_args "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
deleted file mode 100755
index ac171e701..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-vars-from-args.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-join_with_delimiter() {
-    local -;
-    set -euo pipefail
-    local IFS='' delim=${1:-};
-    shift;
-    echo -n "${1:-}";
-    shift;
-    echo -n "${*/#/$delim}";
-}
-
-parse_cmake_vars_from_args() {
-    local -;
-    set -euo pipefail;
-
-    # shellcheck disable=SC2046
-    echo -e "$(join_with_delimiter "\n" $(rapids-parse-cmake-args "$@"))" \
-  | grep '\-D' \
-  | sed -r 's/^-D//';
-}
-
-parse_cmake_vars_from_args "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index 88e0342fa..7c7f06530 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -50,7 +50,7 @@ build_${CPP_LIB}_cpp() {
     # Build C++ lib
     time (
         cmake                               \
-        --build "${CPP_SRC}/build/latest"   \
+        --build "${CPP_SRC}/${BIN_DIR}"     \
         ${v:+--verbose}                     \
         -j${n_jobs}                         \
         --                                  \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index c0dddfa96..edd648e4a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -27,7 +27,7 @@ clean_${CPP_LIB}_cpp() {
     fi
 
     rm -rf -- \
-        "${CPP_SRC}/build/latest"/{*,.*} \
+        "${CPP_SRC}/${BIN_DIR}"/{*,.*} \
         "${CPP_SRC}"/compile_commands.json \
         2>/dev/null || true;
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 918f1e151..3619a071b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -45,42 +45,35 @@ configure_${CPP_LIB}_cpp() {
         rapids-get-num-archs-jobs-and-load "$@" \
     )";
 
-    local build_type="$(rapids-parse-cmake-build-type "${OPTS[@]}" | tr '[:upper:]' '[:lower:]')";
-    local binary_dir="${CPP_SRC}/build/${build_type}";
-    local source_dir="${CPP_SRC}";
-
-    # Reconfigure if previous configure failed
-    if [[ ! -f ${binary_dir}/build.ninja ]]; then
-        rm -rf ${binary_dir};
-    fi
-
-    mkdir -p ${binary_dir};
-    (
-        cd ${source_dir}/build;
-        ln -sfn ${build_type} latest;
-    );
-
     local cmake_args=(-GNinja);
-    cmake_args+=(-S ${source_dir});
-    cmake_args+=(-B ${binary_dir});
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});
-    cmake_args+=(${v:+--log-level=VERBOSE});
+    cmake_args+=("${v:+--log-level=VERBOSE}");
     cmake_args+=("${OPTS[@]}");
 
+    local -r bin_dir="$(rapids-get-cmake-build-dir "${CPP_SRC}" "${cmake_args[@]}")";
+
+    # Reconfigure if previous configure failed
+    if [[ ! -f "${bin_dir}/build.ninja" ]]; then
+        rm -rf "${bin_dir}";
+    fi
+
+    cmake_args+=(-S "${CPP_SRC}");
+    cmake_args+=(-B "${bin_dir}");
+
     time (
         CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
-            cmake ${cmake_args[@]};
+            cmake "${cmake_args[@]}";
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} configure time:";
     ) 2>&1;
 
-    if [[ ! -L ${source_dir}/compile_commands.json \
-            || "$(readlink "${source_dir}/compile_commands.json")" \
-            != ${source_dir}/build/latest/compile_commands.json ]]; then
+    if [[ ! -L "${CPP_SRC}/compile_commands.json" \
+            || "$(readlink "${CPP_SRC}/compile_commands.json")" \
+            != "${CPP_SRC}/${BIN_DIR}/compile_commands.json" ]]; then
         ln -sfn \
-            ${source_dir}/build/latest/compile_commands.json \
-            ${source_dir}/compile_commands.json \
+            "${CPP_SRC}/${BIN_DIR}/compile_commands.json" \
+            "${CPP_SRC}/compile_commands.json" \
             ;
     fi
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index c0fa83f6d..5664df2ce 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -39,7 +39,7 @@ cpack_${CPP_LIB}_cpp() {
         --default-directory-permissions
     ' - <<< "${@@Q}")";
 
-    if ! test -f "${CPP_SRC}/build/latest/CMakeCache.txt"; then
+    if ! test -f "${CPP_SRC}/${BIN_DIR}/CMakeCache.txt"; then
         exit 0;
     fi
 
@@ -57,29 +57,29 @@ cpack_${CPP_LIB}_cpp() {
 
         kernel="$(uname -s)";
 
-        if test -f "${CPP_SRC}"/build/latest/CPackConfig.cmake; then
-            name="$(grep -e '^set(CPACK_PACKAGE_NAME ".*")$' "${CPP_SRC}"/build/latest/CPackConfig.cmake | head -n1)";
-            vers="$(grep -e '^set(CPACK_PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/CPackConfig.cmake | head -n1)";
+        if test -f "${CPP_SRC}/${BIN_DIR}/CPackConfig.cmake"; then
+            name="$(grep -e '^set(CPACK_PACKAGE_NAME ".*")$' "${CPP_SRC}/${BIN_DIR}/CPackConfig.cmake" | head -n1)";
+            vers="$(grep -e '^set(CPACK_PACKAGE_VERSION ".*")$' "${CPP_SRC}/${BIN_DIR}/CPackConfig.cmake" | head -n1)";
             name="${name#*\"}"; name="${name%\"*}";
             vers="${vers#*\"}"; vers="${vers%\"*}";
-        elif test -f "${CPP_SRC}"/build/latest/CPackSourceConfig.cmake; then
-            name="$(grep -e '^set(CPACK_PACKAGE_NAME ".*")$' "${CPP_SRC}"/build/latest/CPackSourceConfig.cmake | head -n1)";
-            vers="$(grep -e '^set(CPACK_PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/CPackSourceConfig.cmake | head -n1)";
+        elif test -f "${CPP_SRC}/${BIN_DIR}/CPackSourceConfig.cmake"; then
+            name="$(grep -e '^set(CPACK_PACKAGE_NAME ".*")$' "${CPP_SRC}/${BIN_DIR}/CPackSourceConfig.cmake" | head -n1)";
+            vers="$(grep -e '^set(CPACK_PACKAGE_VERSION ".*")$' "${CPP_SRC}/${BIN_DIR}/CPackSourceConfig.cmake" | head -n1)";
             name="${name#*\"}"; name="${name%\"*}";
             vers="${vers#*\"}"; vers="${vers%\"*}";
         else
-            if grep -qe '^CMAKE_PROJECT_NAME:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt; then
-                name="$(grep -e '^CMAKE_PROJECT_NAME:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt | head -n1)";
+            if grep -qe '^CMAKE_PROJECT_NAME:.*=.*$' "${CPP_SRC}/${BIN_DIR}/CMakeCache.txt"; then
+                name="$(grep -e '^CMAKE_PROJECT_NAME:.*=.*$' "${CPP_SRC}/${BIN_DIR}/CMakeCache.txt" | head -n1)";
                 name="${name##*=}";
             fi
-            if grep -qe '^CMAKE_PROJECT_VERSION:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt; then
-                vers="$(grep -e '^CMAKE_PROJECT_VERSION:.*=.*$' "${CPP_SRC}"/build/latest/CMakeCache.txt | head -n1)";
+            if grep -qe '^CMAKE_PROJECT_VERSION:.*=.*$' "${CPP_SRC}/${BIN_DIR}/CMakeCache.txt"; then
+                vers="$(grep -e '^CMAKE_PROJECT_VERSION:.*=.*$' "${CPP_SRC}/${BIN_DIR}/CMakeCache.txt" | head -n1)";
                 vers="${vers##*=}";
-            elif test -f "${CPP_SRC}"/build/latest/${CPP_LIB}ConfigVersion.cmake; then
-                vers="$(grep -e '^set(PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/${CPP_LIB}ConfigVersion.cmake | head -n1)";
+            elif test -f "${CPP_SRC}/${BIN_DIR}/${CPP_LIB}ConfigVersion.cmake"; then
+                vers="$(grep -e '^set(PACKAGE_VERSION ".*")$' "${CPP_SRC}/${BIN_DIR}/${CPP_LIB}ConfigVersion.cmake" | head -n1)";
                 vers="${vers#*\"}"; vers="${vers%\"*}";
-            elif test -f "${CPP_SRC}"/build/latest/${CPP_LIB}-config-version.cmake; then
-                vers="$(grep -e '^set(PACKAGE_VERSION ".*")$' "${CPP_SRC}"/build/latest/${CPP_LIB}-config-version.cmake | head -n1)";
+            elif test -f "${CPP_SRC}/${BIN_DIR}/${CPP_LIB}-config-version.cmake"; then
+                vers="$(grep -e '^set(PACKAGE_VERSION ".*")$' "${CPP_SRC}/${BIN_DIR}/${CPP_LIB}-config-version.cmake" | head -n1)";
                 vers="${vers#*\"}"; vers="${vers%\"*}";
             fi
         fi
@@ -95,16 +95,16 @@ cpack_${CPP_LIB}_cpp() {
             fi
 
             slug="${name}-${vers}${comp:+-$comp}-${kernel}";
-            outd="${CPP_SRC}/build/latest/_CPack_Packages/${kernel}/TGZ";
+            outd="${CPP_SRC}/${BIN_DIR}/_CPack_Packages/${kernel}/TGZ";
 
             install-${CPP_LIB}-cpp -p "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}";
 
             if test -d "${outd}/${slug}"; then
                 tar -C "${outd}" -c ${v:+-v} -f "${outd}/${slug}.tar.gz" -I "pigz -p ${n_jobs}" "${slug}";
-                cp -a "${outd}/${slug}.tar.gz" "${CPP_SRC}/build/latest/";
+                cp -a "${outd}/${slug}.tar.gz" "${CPP_SRC}/${BIN_DIR}/";
                 if test -d "${out_dir}"/ \
-                && test -f "${CPP_SRC}/build/latest/${slug}.tar.gz"; then
-                    cp -a "${CPP_SRC}/build/latest/${slug}.tar.gz" "${out_dir}"/;
+                && test -f "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz"; then
+                    cp -a "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz" "${out_dir}"/;
                 fi
             fi
         done
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index 26ee7bd7e..1f32cb9f4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -48,7 +48,7 @@ install_${CPP_LIB}_cpp() {
         fi
         time (
             cmake \
-                --install "${CPP_SRC}"/build/latest/                            \
+                --install "${CPP_SRC}/${BIN_DIR}/"                              \
                 --prefix "${p:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}" \
                 ${comp:+--component "${comp}"}                                  \
                 "${OPTS[@]}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index c6c99d66c..5f0ebf35e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -23,9 +23,9 @@ uninstall_${CPP_LIB}_cpp() {
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
-    if test -f "${CPP_SRC}"/build/latest/install_manifest.txt; then
+    if test -f "${CPP_SRC}/${BIN_DIR}/install_manifest.txt"; then
         time (
-            xargs ${v:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}"/build/latest/install_manifest.txt tr -d "\r") rm -f ${v:+-v} --;
+            xargs ${v:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}/${BIN_DIR}/install_manifest.txt" tr -d "\r") rm -f ${v:+-v} --;
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} uninstall time:";
     ) 2>&1;
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index a551112df..69860b787 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -22,6 +22,13 @@
 #                                         (default: 1)
 #  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
 
+is_using_scikit_build_core() {
+    local -;
+    set -euo pipefail;
+    test -f "${PY_SRC}/pyproject.toml";
+    test "scikit_build_core.build" = "$(python -c "import toml; print(toml.load('${PY_SRC}/pyproject.toml')['build-system']['build-backend'])")";
+}
+
 build_${PY_LIB}_python_editable() {
     local -;
     set -euo pipefail;
@@ -70,6 +77,12 @@ build_${PY_LIB}_python_editable() {
         ninja_args+=("-l${n_load}");
     fi
 
+    if is_using_scikit_build_core; then
+        local bin_dir;
+        bin_dir="$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")";
+        pip_args+=("--config-settings=build-dir=${bin_dir}");
+    fi
+
     pip_args+=("--no-build-isolation");
     pip_args+=("--no-deps");
     pip_args+=("--editable");
@@ -88,11 +101,11 @@ build_${PY_LIB}_python_editable() {
         CUDAFLAGS="${cudaflags}"                     \
         CMAKE_GENERATOR="Ninja"                      \
         PARALLEL_LEVEL="${n_jobs}"                   \
-        CMAKE_ARGS="${cmake_args[@]}"                \
-        SKBUILD_BUILD_OPTIONS="${ninja_args[@]}"     \
+        CMAKE_ARGS="${cmake_args[*]}"                \
+        SKBUILD_BUILD_OPTIONS="${ninja_args[*]}"     \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
         SETUPTOOLS_ENABLE_FEATURES="legacy-editable" \
-            python -m pip install ${pip_args[@]}     \
+            python -m pip install "${pip_args[@]}"   \
         ;
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} install time:";
     ) 2>&1;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index d640dc88c..354e63fc6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -44,6 +44,13 @@
 #  -w,--wheel-dir <dir>                   copy built wheel into <dir>
 #                                         (default: none)
 
+is_using_scikit_build_core() {
+    local -;
+    set -euo pipefail;
+    test -f "${PY_SRC}/pyproject.toml";
+    test "scikit_build_core.build" = "$(python -c "import toml; print(toml.load('${PY_SRC}/pyproject.toml')['build-system']['build-backend'])")";
+}
+
 build_${PY_LIB}_python_wheel() {
     local -;
     set -euo pipefail;
@@ -110,7 +117,7 @@ build_${PY_LIB}_python_wheel() {
 
     if test -n "${only_binary[@]:-}"; then
         pip_args+=("--only-binary");
-        if [ "${only_binary[@]}" != "true" ]; then
+        if test "${only_binary[@]}" != "true"; then
             pip_args+=("${only_binary[@]}");
         fi
     fi
@@ -141,6 +148,10 @@ build_${PY_LIB}_python_wheel() {
 
     if test -n "${no_build_isolation:-}"; then
         pip_args+=("--no-build-isolation");
+        if is_using_scikit_build_core; then
+            local -r bin_dir="$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")";
+            pip_args+=("--config-settings=build-dir=${bin_dir}");
+        fi
     fi
 
     if test -n "${ignore_requires_python:-}"; then
@@ -160,8 +171,8 @@ build_${PY_LIB}_python_wheel() {
         CUDAFLAGS="${cudaflags}"                 \
         CMAKE_GENERATOR="Ninja"                  \
         PARALLEL_LEVEL="${n_jobs}"               \
-        CMAKE_ARGS="${cmake_args[@]}"            \
-        SKBUILD_BUILD_OPTIONS="${ninja_args[@]}" \
+        CMAKE_ARGS="${cmake_args[*]}"            \
+        SKBUILD_BUILD_OPTIONS="${ninja_args[*]}" \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
             python -m pip wheel ${pip_args[@]}   \
         ;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index c44815257..402efbe64 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -28,8 +28,11 @@ clean_${PY_LIB}_python() {
 
     local py_lib="${PY_LIB}";
 
-    rm -rf "${PY_SRC}"/_skbuild \
-        "${PY_SRC}"/{${py_lib},${py_lib//"-"/"_"}}.egg-info;
+    rm -rf -- \
+        "${PY_SRC}"/_skbuild \
+        "${PY_SRC}/${BIN_DIR}"/{*,.*} \
+        "${PY_SRC}"/{${py_lib},${py_lib//"-"/"_"}}.egg-info \
+        2>/dev/null || true;
 
     for lib in ${py_lib} ${py_lib//"-"/"_"}; do
         if test -d "${PY_SRC}"/${lib}/; then
@@ -44,7 +47,7 @@ clean_${PY_LIB}_python() {
 
     if test -d "${PY_SRC}"/build; then
         local slug="$(uname -s)-$(uname -m)";
-        rm -rf                                                                                      \
+        rm -rf --                                                                                   \
             `# scikit-buld-core build dirs`                                                         \
             "${PY_SRC}"/build/cp{${py_ver},${py_ver/./}}-cp{${py_ver},${py_ver/./}}*                \
             `# setuptools/distutils build dirs`                                                     \
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
index f4fb9a633..45dfc8a0c 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -1,7 +1,11 @@
 #! /usr/bin/env bash
 
 print_usage() {
-    sed -n '2,/^$/p' "$(which "${1:-${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}}")" | sed -r 's/^# ?//';
+    local -;
+    set -euo pipefail;
+    local file="${1:-${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}}";
+    if which "${file}"; then file=$(which "${file}"); fi
+    sed -n '2,/^$/p' "${file}" | sed -r 's/^# ?//';
 }
 
 parse_args_to_names() {
@@ -23,7 +27,7 @@ _squeeze_spaces_in_options() {
 parse_all_names_from_usage() {
     cat - \
   | _squeeze_spaces_in_options \
-  | sed -rn 's/^([ ]*)(--?[^*][^ *]+|,|_)+(.*)$/\2/p' \
+  | sed -rn 's/^([ ]*)(--?[^ *]+|,|_)+[^*](.*)$/\2/p' \
   | sed -r 's/(,|\|)/ /g' \
   ;
 }
@@ -60,6 +64,7 @@ _listify() {
   `# replace pipes with newlines`           \
   | tr '|' '\n'                             \
   | grep -v -e '^$'                         \
+  | sort -su                                \
     ;
 }
 
@@ -75,7 +80,7 @@ parse_short_names() {
 parse_long_names() {
     cat -                                        \
   `# take the long opts`                         \
-  | sed -r 's/(-[^ ,\*]+)?[ ]?(--[^,]+)+,?/\2/g' \
+  | sed -rn 's/(--[^,]+)+/\1/p'                  \
   `# remove the leading --`                      \
   | sed -r 's/--?([^ ,]+)+/\1/g'                 \
   | _listify;

From 8b3f4b8e5a899bb034af790fbf7b6946bb460ce4 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 8 Feb 2024 09:34:46 +0000
Subject: [PATCH 116/217] fix yq install when tags are ahead of releases

---
 features/src/rapids-build-utils/install.sh | 11 ++++++-----
 features/src/utils/install.sh              | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 0653c00e2..53a1c0ff6 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -11,15 +11,16 @@ check_packages bc jq pigz sudo wget gettext-base bash-completion ca-certificates
 
 # Install yq if not installed
 if ! type yq >/dev/null 2>&1; then
-    YQ_VERSION=latest;
-    find_version_from_git_tags YQ_VERSION https://github.com/mikefarah/yq;
-
     YQ_BINARY="yq";
     YQ_BINARY+="_$(uname -s | tr '[:upper:]' '[:lower:]')";
     YQ_BINARY+="_${TARGETARCH:-$(dpkg --print-architecture | awk -F'-' '{print $NF}')}";
 
-    wget --no-hsts -q -O- "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_BINARY}.tar.gz" \
-        | tar -C /usr/bin -zf - -x ./${YQ_BINARY} --transform="s/${YQ_BINARY}/yq/";
+    YQ_VERSION=latest;
+    find_version_from_git_tags YQ_VERSION https://github.com/mikefarah/yq;
+    while ! wget --no-hsts -q -O- "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_BINARY}.tar.gz" | tar -C /usr/bin -zf - -x ./${YQ_BINARY} --transform="s/${YQ_BINARY}/yq/"; do
+        echo "(!) YQ version ${YQ_VERSION} failed to download. Attempting to fall back one version to retry...";
+        find_prev_version_from_git_tags YQ_VERSION https://github.com/mikefarah/yq;
+    done
 fi
 
 source /etc/lsb-release;
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 91a11b7df..e90f9a9bd 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -33,15 +33,16 @@ fi
 
 # Install yq if not installed
 if ! type yq >/dev/null 2>&1; then
-    YQ_VERSION=latest;
-    find_version_from_git_tags YQ_VERSION https://github.com/mikefarah/yq;
-
     YQ_BINARY="yq";
     YQ_BINARY+="_$(uname -s | tr '[:upper:]' '[:lower:]')";
     YQ_BINARY+="_${TARGETARCH:-$(dpkg --print-architecture | awk -F'-' '{print $NF}')}";
 
-    wget --no-hsts -q -O- "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_BINARY}.tar.gz" \
-        | tar -C /usr/bin -zf - -x ./${YQ_BINARY} --transform="s/${YQ_BINARY}/yq/";
+    YQ_VERSION=latest;
+    find_version_from_git_tags YQ_VERSION https://github.com/mikefarah/yq;
+    while ! wget --no-hsts -q -O- "https://github.com/mikefarah/yq/releases/download/v${YQ_VERSION}/${YQ_BINARY}.tar.gz" | tar -C /usr/bin -zf - -x ./${YQ_BINARY} --transform="s/${YQ_BINARY}/yq/"; do
+        echo "(!) YQ version ${YQ_VERSION} failed to download. Attempting to fall back one version to retry...";
+        find_prev_version_from_git_tags YQ_VERSION https://github.com/mikefarah/yq;
+    done
 fi
 
 # Remove built-in anacron configs

From 1ef78405605ea887e2df23cd4d2eb6c95cad64e4 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 8 Feb 2024 09:58:43 +0000
Subject: [PATCH 117/217] remove duplicate --log-level=VERBOSE arg

---
 .../rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 354e63fc6..b8dc0f7af 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -77,10 +77,6 @@ build_${PY_LIB}_python_wheel() {
 
     local cmake_args=(${PY_CMAKE_ARGS});
 
-    if test -n "${v}"; then
-        cmake_args+=("--log-level=VERBOSE");
-    fi
-
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
     cmake_args+=(${CPP_ARGS});

From c3f4cc438d32997a2c99f718c9a027dd00ae045b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 8 Feb 2024 22:52:52 -0800
Subject: [PATCH 118/217] fix devcontainer-utils-vault-s3-init for sccache
 v0.7.7

---
 .../opt/devcontainer/bin/vault/auth/github.sh |  2 +-
 .../bin/vault/s3/creds/generate.sh            |  3 +-
 .../bin/vault/s3/creds/persist.sh             | 43 ++++++++-----------
 .../bin/vault/s3/creds/propagate.sh           |  6 ++-
 .../bin/vault/s3/creds/schedule.sh            |  3 +-
 .../devcontainer/bin/vault/s3/creds/test.sh   | 39 ++++-------------
 .../opt/devcontainer/bin/vault/s3/init.sh     | 42 +++++++-----------
 7 files changed, 51 insertions(+), 87 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
index ff2491ac1..f48bd0796 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
@@ -8,7 +8,7 @@ get_vault_token() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"vault-auth-github"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"vault-auth-github"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index 9c6ccf5f8..d0120ce87 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -9,7 +9,8 @@ generate_s3_creds() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-generate"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
+      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-generate"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index 83daf65f8..372f891b5 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -11,8 +11,6 @@
 #                                 (default: false)
 #  --no-region                    Unset the $SCCACHE_REGION environment variable for all shells.
 #                                 (default: false)
-#  --no-credentials               Set the $SCCACHE_S3_NO_CREDENTIALS environment variable for all shells to 1.
-#                                 (default: false)
 #
 # Options that require values:
 #  --stamp <stamp>                Timestamp when the S3 credentials were generated.
@@ -38,7 +36,8 @@ persist_s3_creds() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-persist"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
+      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-persist"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
@@ -50,7 +49,6 @@ persist_s3_creds() {
     reset_envvar "AWS_ACCESS_KEY_ID";
     reset_envvar "AWS_SESSION_TOKEN";
     reset_envvar "AWS_SECRET_ACCESS_KEY";
-    reset_envvar "SCCACHE_S3_NO_CREDENTIALS";
 
     mkdir -p ~/.aws;
     rm -f ~/.aws/{config,credentials};
@@ -84,35 +82,30 @@ $(cat ~/.aws/config)
 ________EOF
     fi
 
-    if ! grep -qE "^$" <<< "${no_credentials:-}"; then
-        export_envvar "SCCACHE_S3_NO_CREDENTIALS" "1";
-    else
-
-        if ! grep -qE "^$" <<< "${aws_access_key_id:-}"; then
-            cat <<____________EOF >> ~/.aws/credentials
+    if ! grep -qE "^$" <<< "${aws_access_key_id:-}"; then
+        cat <<________EOF >> ~/.aws/credentials
 aws_access_key_id=${aws_access_key_id}
-____________EOF
-        fi
+________EOF
+    fi
 
-        if ! grep -qE "^$" <<< "${aws_session_token:-}"; then
-            cat <<____________EOF >> ~/.aws/credentials
+    if ! grep -qE "^$" <<< "${aws_session_token:-}"; then
+        cat <<________EOF >> ~/.aws/credentials
 aws_session_token=${aws_session_token}
-____________EOF
-        fi
+________EOF
+    fi
 
-        if ! grep -qE "^$" <<< "${aws_secret_access_key:-}"; then
-            cat <<____________EOF >> ~/.aws/credentials
+    if ! grep -qE "^$" <<< "${aws_secret_access_key:-}"; then
+        cat <<________EOF >> ~/.aws/credentials
 aws_secret_access_key=${aws_secret_access_key}
-____________EOF
-        fi
+________EOF
+    fi
 
-        if test -f ~/.aws/credentials; then
-            cat <<____________EOF > ~/.aws/credentials2 && mv ~/.aws/credentials{2,}
+    if test -f ~/.aws/credentials; then
+        cat <<________EOF > ~/.aws/credentials2 && mv ~/.aws/credentials{2,}
 [default]
 $(cat ~/.aws/credentials)
-____________EOF
-            chmod 0600 ~/.aws/credentials;
-        fi
+________EOF
+        chmod 0600 ~/.aws/credentials;
     fi
 }
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
index 743b99f0e..f089a0023 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
@@ -7,7 +7,8 @@ ensure_s3_creds_have_propagated() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-propagate"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
+      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-propagate"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
@@ -23,8 +24,9 @@ ensure_s3_creds_have_propagated() {
 
     while true; do
 
-        if SCCACHE_NO_DAEMON=1 sccache --show-stats >/dev/null 2>&1; then
+        if sccache --start-server >/dev/null 2>&1; then
             if [ "${num_restarts}" -gt "0" ]; then echo "Success!"; fi
+            sccache --stop-server >/dev/null 2>&1 || true;
             exit 0;
         fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index ed6f0a951..19220ad82 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -7,7 +7,8 @@ schedule_s3_creds_refresh() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-schedule"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
+      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-schedule"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
index 88264fbdf..5b8c1edb2 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -9,7 +9,8 @@ test_aws_creds() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"vault-s3-creds-test"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
+      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-test"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
@@ -36,35 +37,13 @@ test_aws_creds() {
         sccache --stop-server >/dev/null 2>&1 || true;
     fi
 
-    export SCCACHE_NO_DAEMON="1";
-    export SCCACHE_BUCKET="${bucket:-}";
-    export SCCACHE_REGION="${region:-}";
-    export AWS_ACCESS_KEY_ID="${aws_access_key_id:-}";
-    export AWS_SESSION_TOKEN="${aws_session_token:-}";
-    export AWS_SECRET_ACCESS_KEY="${aws_secret_access_key:-}";
-
-    if ! sccache --show-stats 2>&1 | grep -qE 'Cache location \s+ s3'; then
-
-        export SCCACHE_S3_NO_CREDENTIALS="1";
-
-        export AWS_ACCESS_KEY_ID=;
-        export AWS_SESSION_TOKEN=;
-        export AWS_SECRET_ACCESS_KEY=;
-        export -n AWS_ACCESS_KEY_ID;
-        export -n AWS_SESSION_TOKEN;
-        export -n AWS_SECRET_ACCESS_KEY;
-        unset AWS_ACCESS_KEY_ID;
-        unset AWS_SESSION_TOKEN;
-        unset AWS_SECRET_ACCESS_KEY;
-
-        if sccache --show-stats 2>&1 | grep -qE 'Cache location \s+ s3'; then
-            exit 2;
-        fi
-
-        exit 1;
-    fi
-
-    exit 0;
+    SCCACHE_BUCKET="${bucket:-}" \
+    SCCACHE_REGION="${region:-}" \
+    AWS_ACCESS_KEY_ID="${aws_access_key_id:-}" \
+    AWS_SESSION_TOKEN="${aws_session_token:-}" \
+    AWS_SECRET_ACCESS_KEY="${aws_secret_access_key:-}" \
+    sccache --start-server >/dev/null 2>&1;
+    sccache --stop-server | grep -qE 'Cache location \s+ s3';
 }
 
 test_aws_creds "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index b08df2b9c..6e28f4b6a 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -12,7 +12,8 @@ init_vault_s3_creds() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"vault-s3-init"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
+      || test -z "${devcontainer_utils_debug##*"vault-s3-init"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
@@ -22,7 +23,7 @@ init_vault_s3_creds() {
             && grep -qE "^$" <<< "${AWS_SECRET_ACCESS_KEY:-}" ; then
                 if test -n "${VAULT_HOST:-}"                  ; then
                     # Generate S3 creds if they don't exist (or are expired)
-                    if devcontainer-utils-vault-s3-creds-test >/dev/null 2>&1 \
+                    if devcontainer-utils-vault-s3-creds-test \
                     || devcontainer-utils-vault-s3-creds-generate; then
                         # Persist creds in ~/.aws dir
                         devcontainer-utils-vault-s3-creds-persist - <<<               \
@@ -36,39 +37,26 @@ init_vault_s3_creds() {
                     else
                         devcontainer-utils-vault-s3-creds-persist - <<< --no-bucket --no-region;
                     fi
+                elif devcontainer-utils-vault-s3-creds-test; then
+                    devcontainer-utils-vault-s3-creds-persist - <<<               \
+                        --bucket="${SCCACHE_BUCKET:-}"                            \
+                        --region="${SCCACHE_REGION:-${AWS_DEFAULT_REGION:-}}"     \
+                        --aws-access-key-id="$(s3_cred aws_access_key_id)"        \
+                        --aws-session-token="$(s3_cred aws_session_token)"        \
+                        --aws-secret-access-key="$(s3_cred aws_secret_access_key)";
                 else
-                    # If credentials have been mounted in, ensure they're used
-                    case $(devcontainer-utils-vault-s3-creds-test; echo $?) in
-                        # bucket is read + write with the current credentials
-                        [0] )
-                            devcontainer-utils-vault-s3-creds-persist - <<<               \
-                                --bucket="${SCCACHE_BUCKET:-}"                            \
-                                --region="${SCCACHE_REGION:-${AWS_DEFAULT_REGION:-}}"     \
-                                --aws-access-key-id="$(s3_cred aws_access_key_id)"        \
-                                --aws-session-token="$(s3_cred aws_session_token)"        \
-                                --aws-secret-access-key="$(s3_cred aws_secret_access_key)";
-                            ;;
-                        # bucket is read-only and should be accessed without credentials
-                        [2] )
-                            devcontainer-utils-vault-s3-creds-persist - <<<          \
-                                --no-credentials                                     \
-                                --bucket="${SCCACHE_BUCKET:-}"                       \
-                                --region="${SCCACHE_REGION:-${AWS_DEFAULT_REGION:-}}";
-                            ;;
-                          # bucket is inaccessible
-                          * )
-                            devcontainer-utils-vault-s3-creds-persist - <<< --no-bucket --no-region;;
-                    esac
+                    # bucket is inaccessible
+                    devcontainer-utils-vault-s3-creds-persist - <<< --no-bucket --no-region;
                 fi
-            elif devcontainer-utils-vault-s3-creds-propagate; then
+            else
                 # Block until the new temporary AWS S3 credentials propagate
-                echo -n "";
+                devcontainer-utils-vault-s3-creds-propagate;
             fi
         fi
         # shellcheck disable=SC1090
         . /etc/profile.d/*-devcontainer-utils.sh;
         # start the sccache server
-        sccache --start-server >/dev/null 2>&1 || true;
+        sccache --start-server || true;
     fi
 }
 

From 49b78525ebd97b0b7a35b514d18f6feb3b16f78e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 01:35:17 -0800
Subject: [PATCH 119/217] prefix variables

---
 .../devcontainer/bin/bash/completion.tmpl.sh  | 74 +++++++++----------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
index b34067da5..107014a69 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
@@ -19,12 +19,12 @@ _zip_names_and_types() {
     done < "${1}";
 }
 
-declare -A usage=();
-declare -A script=();
-declare -A bool_names=();
-declare -A value_names=();
-declare -A value_types="";
-declare -A option_names="";
+declare -g -A _devcontainer_utils_completions_usage=();
+declare -g -A _devcontainer_utils_completions_script=();
+declare -g -A _devcontainer_utils_completions_bool_names=();
+declare -g -A _devcontainer_utils_completions_value_names=();
+declare -g -A _devcontainer_utils_completions_value_types="";
+declare -g -A _devcontainer_utils_completions_option_names="";
 
 _devcontainer_utils_completions() {
     # trap 'sleep 10;' EXIT;
@@ -33,33 +33,33 @@ _devcontainer_utils_completions() {
 
     local CMD="$1";
 
-    if test "${script[${CMD}]:-}" != "$(which "${CMD}")"; then
-        script["${CMD}"]="$(which "${CMD}")";
-        if test ${#script["${CMD}"]} -eq 0; then return; fi
-        unset "usage[${CMD}]";
-        unset "bool_names[${CMD}]";
-        unset "value_names[${CMD}]";
-        unset "value_types[${CMD}]";
-        unset "option_names[${CMD}]";
+    if test "${_devcontainer_utils_completions_script[${CMD}]:-}" != "$(which "${CMD}")"; then
+        _devcontainer_utils_completions_script["${CMD}"]="$(which "${CMD}")";
+        if test ${#_devcontainer_utils_completions_script["${CMD}"]} -eq 0; then return; fi
+        unset "_devcontainer_utils_completions_usage[${CMD}]";
+        unset "_devcontainer_utils_completions_bool_names[${CMD}]";
+        unset "_devcontainer_utils_completions_value_names[${CMD}]";
+        unset "_devcontainer_utils_completions_value_types[${CMD}]";
+        unset "_devcontainer_utils_completions_option_names[${CMD}]";
     fi
-    if ! test -v usage["${CMD}"]; then
-        usage["${CMD}"]="$(sed -n '2,/^$/p' "${script[${CMD}]}" | sed -r 's/^# ?//')";
-        if test ${#usage[${CMD}]} -eq 0; then return; fi
+    if ! test -v _devcontainer_utils_completions_usage["${CMD}"]; then
+        _devcontainer_utils_completions_usage["${CMD}"]="$(sed -n '2,/^$/p' "${_devcontainer_utils_completions_script[${CMD}]}" | sed -r 's/^# ?//')";
+        if test ${#_devcontainer_utils_completions_usage[${CMD}]} -eq 0; then return; fi
     fi
-    if test "${#bool_names[${CMD}]}" -eq 0; then
-        bool_names["${CMD}"]="$(parse_bool_names_from_usage <<< "${usage[${CMD}]}")";
+    if test "${#_devcontainer_utils_completions_bool_names[${CMD}]}" -eq 0; then
+        _devcontainer_utils_completions_bool_names["${CMD}"]="$(parse_bool_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}")";
     fi
-    if test "${#value_names[${CMD}]}" -eq 0; then
-        value_names["${CMD}"]="$(parse_value_names_from_usage <<< "${usage[${CMD}]}")";
+    if test "${#_devcontainer_utils_completions_value_names[${CMD}]}" -eq 0; then
+        _devcontainer_utils_completions_value_names["${CMD}"]="$(parse_value_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}")";
     fi
-    if ! test -v value_types["${CMD}"]; then
-        value_types["${CMD}"]="$(_zip_names_and_types              \
-            <(parse_value_names_from_usage <<< "${usage[${CMD}]}") \
-            <(parse_value_types_from_usage <<< "${usage[${CMD}]}") \
+    if ! test -v _devcontainer_utils_completions_value_types["${CMD}"]; then
+        _devcontainer_utils_completions_value_types["${CMD}"]="$(_zip_names_and_types              \
+            <(parse_value_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}") \
+            <(parse_value_types_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}") \
         )";
     fi
-    if ! test -v option_names["${CMD}"]; then
-        option_names["${CMD}"]="${bool_names[${CMD}]} ${value_names[${CMD}]}";
+    if ! test -v _devcontainer_utils_completions_option_names["${CMD}"]; then
+        _devcontainer_utils_completions_option_names["${CMD}"]="${_devcontainer_utils_completions_bool_names[${CMD}]} ${_devcontainer_utils_completions_value_names[${CMD}]}";
     fi
 
     local cur="${COMP_WORDS[$COMP_CWORD]}";
@@ -73,20 +73,16 @@ _devcontainer_utils_completions() {
             local type_="${pair[1]}";
             if [[ ${name_} == ${prev}* ]]; then
                 case "${type_}" in
-                    "<num>")
+                    "<num>"|"<number>")
                         # shellcheck disable=SC2207
                         COMPREPLY=($(grep -P "^[0-9]+$" <<< "${cur}"));
                         return;
                         ;;
-                    "<dir>")
+                    "<dir>"|"<directory>")
                         _filedir -d;
                         return;
                         ;;
-                    "<file>")
-                        _filedir;
-                        return;
-                        ;;
-                    "<path>")
+                    "<file>"|"<path>")
                         _filedir;
                         return;
                         ;;
@@ -110,25 +106,25 @@ _devcontainer_utils_completions() {
                         ;;
                 esac
             fi
-        done <<< "${value_types[${CMD}]}";
+        done <<< "${_devcontainer_utils_completions_value_types[${CMD}]}";
     fi
 
-    declare -a bools="(${bool_names[${CMD}]})";
+    declare -a bools="(${_devcontainer_utils_completions_bool_names[${CMD}]})";
 
     for ((idx_a=0; idx_a < ${#bools[@]}; idx_a+=1)); do
         if [[ ${bools[$idx_a]} == ${cur}* ]]; then
             # shellcheck disable=SC2207
-            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${cur}"));
+            COMPREPLY=($(compgen -o nosort -W "${_devcontainer_utils_completions_option_names[$CMD]}" -- "${cur}"));
             return;
         fi
     done
 
-    declare -a value="(${value_names[${CMD}]})";
+    declare -a value="(${_devcontainer_utils_completions_value_names[${CMD}]})";
 
     for ((idx_a=0; idx_a < ${#value[@]}; idx_a+=1)); do
         if [[ ${value[$idx_a]} == ${cur}* ]]; then
             # shellcheck disable=SC2207
-            COMPREPLY=($(compgen -o nosort -W "${option_names[$CMD]}" -- "${cur}"));
+            COMPREPLY=($(compgen -o nosort -W "${_devcontainer_utils_completions_option_names[$CMD]}" -- "${cur}"));
             return;
         fi
     done

From 5d0b7f02ddf26936d098efd9192d4cb237589b72 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 01:35:56 -0800
Subject: [PATCH 120/217] fix parse-cmake-args, add
 parse-pip-{install,wheel}-args

---
 features/src/rapids-build-utils/install.sh    |  2 +
 .../bin/parse-cmake-args.sh                   | 49 +------------------
 .../bin/parse-pip-install-args.sh             | 40 +++++++++++++++
 .../bin/parse-pip-wheel-args.sh               | 40 +++++++++++++++
 .../bin/parse-args-from-docstring.sh          | 42 ++++++++++------
 .../utils/opt/devcontainer/bin/parse-args.sh  | 29 ++++++-----
 6 files changed, 128 insertions(+), 74 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 53a1c0ff6..7a07e5b9c 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -68,6 +68,8 @@ install_utility make-vscode-workspace;
 install_utility parse-cmake-args;
 install_utility parse-cmake-build-type;
 install_utility parse-cmake-define;
+install_utility parse-pip-install-args;
+install_utility parse-pip-wheel-args;
 install_utility python-pkg-roots;
 install_utility python-pkg-names;
 install_utility python-conda-pkg-names;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
index abae71e35..cb8669a8d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
@@ -42,7 +42,7 @@
 #  -W (no-error=deprecated)        Make deprecated macro and function warnings not errors.
 #  --preset <preset>               Specify a configure preset.
 #  --graphviz <file>               Generate graphviz of dependencies, see CMakeGraphVizOptions.cmake for more.
-#  --loglevel,--log-level (ERROR|WARNING|NOTICE|STATUS|VERBOSE|DEBUG|TRACE)
+#  --log-level,--loglevel (ERROR|WARNING|NOTICE|STATUS|VERBOSE|DEBUG|TRACE)
 #                                  Set the verbosity of messages from CMake files. --loglevel is also accepted for backward compatibility reasons.
 #  --debug-find-pkg <pkg-name>     Limit cmake debug-find to the comma-separated list of packages
 #  --debug-find-var <var-name>     Limit cmake debug-find to the comma-separated list of result variables
@@ -69,52 +69,7 @@ parse_cmake_args() {
 
     eval "$(devcontainer-utils-parse-args rapids-parse-cmake-args "$@" <&0)";
 
-    local -r usage="$(print_usage "$(realpath -m "${BASH_SOURCE[0]}")")";
-    local -ar long_bools="($(parse_bool_names_from_usage   <<< "${usage}" | parse_long_names))";
-    local -ar long_value="($(parse_value_names_from_usage  <<< "${usage}" | parse_long_names))";
-    local -ar short_bools="($(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names))";
-    local -ar short_value="($(parse_value_names_from_usage <<< "${usage}" | parse_short_names | grep -vP '(S|B|G|C|U|T|A)'))";
-
-    local k;
-    local cmake_args=();
-
-    for k in "${short_bools[@]}"; do
-        local -n v=${k//-/_};
-        if test -n "${v[*]:-}"; then
-            cmake_args+=("-${k}");
-        fi
-    done
-    unset "${short_bools[@]//-/_}";
-
-    # short value options that might need spaces
-    for k in S B G C U T A; do
-        local -n v=${k//-/_};
-        cmake_args+=("${v[@]/#/-${k} }");
-    done
-    unset S B G C U T A;
-
-    # All other value opts should be fine w/o spaces
-    for k in "${short_value[@]}"; do
-        local -n v=${k//-/_};
-        cmake_args+=("${v[@]/#/-${k}}");
-    done
-    unset "${short_value[@]//-/_}";
-
-    for k in "${long_bools[@]}"; do
-        local -n v=${k//-/_};
-        if test -n "${v[*]:-}"; then
-            cmake_args+=("--${k}");
-        fi
-    done
-    unset "${long_bools[@]//-/_}";
-
-    for k in "${long_value[@]}"; do
-        local -n v=${k//-/_};
-        cmake_args+=("${v[@]/#/--${k}=}");
-    done
-    unset "${long_value[@]//-/_}";
-
-    echo "${cmake_args[@]}";
+    echo "${ARGS[*]}";
 }
 
 parse_cmake_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh
new file mode 100755
index 000000000..53a3c8788
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-parse-pip-install-args [OPTION]...
+#
+# Filter an arguments list to the subset that `pip install` accepts.
+#
+# -q,--quiet   <value> Give less output. Option is additive, and can be used up to 3 times (corresponding to WARNING, ERROR, and CRITICAL logging levels).
+# -v,--verbose <value> Give more output. Option is additive, and can be used up to 3 times.
+# Install Options:
+
+if ! test -f /tmp/pip-install-help.txt; then
+    pip install --help >/tmp/pip-install-help.txt 2>&1;
+fi
+
+# shellcheck disable=SC1091
+. devcontainer-utils-parse-args-from-docstring;
+
+parse_pip_install_args() {
+    local -;
+    set -euo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-pip-install-args"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
+    eval "$(devcontainer-utils-parse-args <(
+        cat <(print_usage rapids-parse-pip-install-args) \
+            <(sed -n '0,/Install Options:/!p' /tmp/pip-install-help.txt) \
+      | sed 's/^/# /'
+    ) "$@" <&0)";
+
+    echo "${ARGS[*]}";
+}
+
+parse_pip_install_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh
new file mode 100755
index 000000000..de83cf600
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-parse-pip-wheel-args [OPTION]...
+#
+# Filter an arguments list to the subset that `pip wheel` accepts.
+#
+# -q,--quiet   <value> Give less output. Option is additive, and can be used up to 3 times (corresponding to WARNING, ERROR, and CRITICAL logging levels).
+# -v,--verbose <value> Give more output. Option is additive, and can be used up to 3 times.
+# Wheel Options:
+
+if ! test -f /tmp/pip-wheel-help.txt; then
+    pip wheel --help >/tmp/pip-wheel-help.txt 2>&1;
+fi
+
+# shellcheck disable=SC1091
+. devcontainer-utils-parse-args-from-docstring;
+
+parse_pip_wheel_args() {
+    local -;
+    set -euo pipefail;
+
+    # shellcheck disable=SC2154
+    if test -n "${rapids_build_utils_debug:-}" \
+    && { test -z "${rapids_build_utils_debug##*"*"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
+          || test -z "${rapids_build_utils_debug##*"parse-pip-wheel-args"*}"; }; then
+        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
+    fi
+
+    eval "$(devcontainer-utils-parse-args <(
+        cat <(print_usage rapids-parse-pip-wheel-args) \
+            <(sed -n '0,/Wheel Options:/!p' /tmp/pip-wheel-help.txt) \
+      | sed 's/^/# /'
+    ) "$@" <&0)";
+
+    echo "${ARGS[*]}";
+}
+
+parse_pip_wheel_args "$@" <&0;
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
index 45dfc8a0c..6135e8793 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -27,7 +27,7 @@ _squeeze_spaces_in_options() {
 parse_all_names_from_usage() {
     cat - \
   | _squeeze_spaces_in_options \
-  | sed -rn 's/^([ ]*)(--?[^ *]+|,|_)+[^*](.*)$/\2/p' \
+  | sed -rn 's/^[ ]*(--?[^ *]+)+[^*]*$/\1/p' \
   | sed -r 's/(,|\|)/ /g' \
   ;
 }
@@ -46,12 +46,14 @@ parse_value_types_from_usage() {
 }
 
 parse_bool_names_from_usage() {
+    # bool names are the complement of `all names` \ `value names`
     tee >(parse_all_names_from_usage)   \
         >(parse_value_names_from_usage) \
-        1>/dev/null \
-  | sort -s         \
-  | uniq -u         \
-  | sed -r 's/(,|\|)/ /g';
+        1>/dev/null                     \
+  | sort -s                             \
+  | uniq -u                             \
+  | sed -r 's/(,|\|)/ /g'               \
+    ;
 }
 
 _listify() {
@@ -68,22 +70,34 @@ _listify() {
     ;
 }
 
-parse_short_names() {
+_take_short_opts() {
     cat -                                   \
   `# skip the long opts`                    \
   | sed -r 's/([ ]?--[^ ,]+)+,?//g'         \
-  `# take the short opts`                   \
+  | _listify                                \
+    ;
+}
+
+parse_short_names() {
+    cat -                                   \
+  `# skip the long opts`                    \
+  | _take_short_opts                        \
+  `# remove the leading -`                  \
   | sed -r 's/-([^ ,\*]+)+[,\*]?/\1/g'      \
-  | _listify;
+    ;
 }
 
 parse_long_names() {
-    cat -                                        \
-  `# take the long opts`                         \
-  | sed -rn 's/(--[^,]+)+/\1/p'                  \
-  `# remove the leading --`                      \
-  | sed -r 's/--?([^ ,]+)+/\1/g'                 \
-  | _listify;
+    # long opts are the complement of `all opts` \ `short opts`
+    tee >(_listify)              \
+        >(_take_short_opts)      \
+        1>/dev/null              \
+  | sort -s                      \
+  | uniq -u                      \
+  `# remove the leading --`      \
+  | sed -r 's/--?([^ ,]+)+/\1/g' \
+  | _listify                     \
+    ;
 }
 
 parse_aliases() {
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index e79902170..8aaff9c24 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -23,7 +23,8 @@ parse_args() {
     local val;
     local -a arg;
 
-    local -A args=();
+    local -A _map=();
+    local -a args=();
     local -a opts=();
     local -A typs=();
     local -a rest=();
@@ -74,7 +75,7 @@ parse_args() {
     take_map["help"]=1;
 
     for key in "${!alias_map[@]}"; do
-        args["${key}"]="";
+        _map["${key}"]="";
         local -a aliases="(${alias_map[${key}]})";
         for alias in "${aliases[@]}"; do
             reverse_alias_map["${alias}"]="${key}";
@@ -258,15 +259,16 @@ parse_args() {
                 if test -v skip_map["${key}"] || ! test -v take_map["${key}"]; then
                     opts+=("${arg[@]}");
                 else
+                    args+=("${arg[@]}");
                     if test -v reverse_alias_map["${key}"]; then
                         key="${reverse_alias_map["${key}"]}";
                     fi
                     if test "${typ}" = bool; then
-                        args["${key}"]="${val@Q}";
-                    elif test -z "${args["${key}"]}"; then
-                        args["${key}"]="${val@Q}";
+                        _map["${key}"]="${val@Q}";
+                    elif test -z "${_map["${key}"]}"; then
+                        _map["${key}"]="${val@Q}";
                     else
-                        args["${key}"]+=" ${val@Q}";
+                        _map["${key}"]+=" ${val@Q}";
                     fi
                 fi
             fi
@@ -298,24 +300,25 @@ parse_args() {
         done
     done
 
-    if test -n "${args[h]:-}"; then
+    if test -n "${_map[h]:-}"; then
         cat <<< "${usage}" >&2;
         echo >&2;
         echo "exit 0";
     else
-        echo "declare -A ARGS=(";
-        for key in "${!args[@]}"; do
-            echo "[${key@Q}]=${args["${key}"]@Q}";
+        echo "declare -A ARGS_MAP=(";
+        for key in "${!_map[@]}"; do
+            echo "[${key@Q}]=${_map["${key}"]@Q}";
         done
         echo ")";
+        echo "declare -a ARGS=(${args[*]@Q})";
         echo "declare -a OPTS=(${opts[*]@Q})";
         echo "declare -a REST=(${rest[*]@Q})";
 
-        for key in "${!args[@]}"; do
+        for key in "${!_map[@]}"; do
             if test "${typs["${key}"]}" = bool; then
-                echo "declare ${key//-/_}=${args["${key}"]}";
+                echo "declare ${key//-/_}=${_map["${key}"]}";
             else
-                echo "declare -a ${key//-/_}=(${args["${key}"]})";
+                echo "declare -a ${key//-/_}=(${_map["${key}"]})";
             fi
             local -a aliases="(${alias_map["${key}"]})";
             for alias in "${aliases[@]}"; do

From fe0ac6d577e2d7c75a687222d09014e4580b6dc5 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 01:36:25 -0800
Subject: [PATCH 121/217] fix vault-s3-init for sccache v0.7.7

---
 .../opt/devcontainer/bin/ssh/init-deploy-keys.sh    |  2 +-
 .../devcontainer/bin/vault/s3/creds/propagate.sh    |  1 -
 .../opt/devcontainer/bin/vault/s3/creds/test.sh     | 12 ++++++------
 .../src/utils/opt/devcontainer/bin/vault/s3/init.sh | 13 ++++---------
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
index 30f0fd57d..9e28c4f81 100755
--- a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
+++ b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
@@ -7,7 +7,7 @@ init_ssh_deploy_keys() {
     # shellcheck disable=SC2154
     if test -n "${devcontainer_utils_debug:-}" \
     && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"init-deploy-keys"*}"; }; then
+      || test -z "${devcontainer_utils_debug##*"init-deploy-keys"*}"; }; then
         PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
     fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
index f089a0023..f330c89f7 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
@@ -26,7 +26,6 @@ ensure_s3_creds_have_propagated() {
 
         if sccache --start-server >/dev/null 2>&1; then
             if [ "${num_restarts}" -gt "0" ]; then echo "Success!"; fi
-            sccache --stop-server >/dev/null 2>&1 || true;
             exit 0;
         fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
index 5b8c1edb2..23da9317a 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -25,13 +25,13 @@ test_aws_creds() {
         fi
     fi
 
-    local bucket="${SCCACHE_BUCKET:-"$(grep 'bucket=' ~/.aws/config 2>/dev/null | sed 's/bucket=//' || echo)"}";
+    local bucket="${SCCACHE_BUCKET:-"$(sed -n 's/bucket=//p' ~/.aws/config 2>/dev/null)"}";
     if [ -z "${bucket:-}" ]; then exit 1; fi
 
-    local region="${SCCACHE_REGION:-"${AWS_DEFAULT_REGION:-"$(grep 'region=' ~/.aws/config 2>/dev/null | sed 's/region=//' || echo)"}"}";
-    local aws_access_key_id="${AWS_ACCESS_KEY_ID:-"$(grep 'aws_access_key_id=' ~/.aws/credentials 2>/dev/null | sed 's/aws_access_key_id=//' || echo)"}";
-    local aws_session_token="${AWS_SESSION_TOKEN:-"$(grep 'aws_session_token=' ~/.aws/credentials 2>/dev/null | sed 's/aws_session_token=//' || echo)"}";
-    local aws_secret_access_key="${AWS_SECRET_ACCESS_KEY:-"$(grep 'aws_secret_access_key=' ~/.aws/credentials 2>/dev/null | sed 's/aws_secret_access_key=//' || echo)"}";
+    local region="${SCCACHE_REGION:-"${AWS_DEFAULT_REGION:-"$(sed -n 's/region=//p' ~/.aws/config 2>/dev/null)"}"}";
+    local aws_access_key_id="${AWS_ACCESS_KEY_ID:-"$(sed -n 's/aws_access_key_id=//p' ~/.aws/credentials 2>/dev/null)"}";
+    local aws_session_token="${AWS_SESSION_TOKEN:-"$(sed -n 's/aws_session_token=//p' ~/.aws/credentials 2>/dev/null)"}";
+    local aws_secret_access_key="${AWS_SECRET_ACCESS_KEY:-"$(sed -n 's/aws_secret_access_key=//p' ~/.aws/credentials 2>/dev/null)"}";
 
     if test -n "$(pgrep sccache || echo)"; then
         sccache --stop-server >/dev/null 2>&1 || true;
@@ -43,7 +43,7 @@ test_aws_creds() {
     AWS_SESSION_TOKEN="${aws_session_token:-}" \
     AWS_SECRET_ACCESS_KEY="${aws_secret_access_key:-}" \
     sccache --start-server >/dev/null 2>&1;
-    sccache --stop-server | grep -qE 'Cache location \s+ s3';
+    sccache --show-stats | grep -qE 'Cache location \s+ s3';
 }
 
 test_aws_creds "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index 6e28f4b6a..8faab0654 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -1,11 +1,10 @@
 #! /usr/bin/env bash
 
 s3_cred() {
-    grep "$1=" ~/.aws/credentials 2>/dev/null | sed "s/$1=//" || echo;
+    sed -n "s/$1=//p" ~/.aws/credentials 2>/dev/null;
 }
 
 init_vault_s3_creds() {
-
     local -
     set -euo pipefail;
 
@@ -48,15 +47,11 @@ init_vault_s3_creds() {
                     # bucket is inaccessible
                     devcontainer-utils-vault-s3-creds-persist - <<< --no-bucket --no-region;
                 fi
-            else
-                # Block until the new temporary AWS S3 credentials propagate
-                devcontainer-utils-vault-s3-creds-propagate;
+            elif ! devcontainer-utils-vault-s3-creds-propagate; then
+                # bucket is inaccessible
+                devcontainer-utils-vault-s3-creds-persist <<< "--no_bucket --no_region";
             fi
         fi
-        # shellcheck disable=SC1090
-        . /etc/profile.d/*-devcontainer-utils.sh;
-        # start the sccache server
-        sccache --start-server || true;
     fi
 }
 

From a1f6758ca228d7d2fa0800bed5f0545012777061 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 01:36:43 -0800
Subject: [PATCH 122/217] cleanup

---
 .../bin/tmpl/python.build.editable.tmpl.sh        |  4 +---
 .../bin/tmpl/python.build.wheel.tmpl.sh           | 15 ++++++++-------
 .../bin/tmpl/python.clean.tmpl.sh                 |  8 ++++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index 69860b787..bffa23071 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -78,9 +78,7 @@ build_${PY_LIB}_python_editable() {
     fi
 
     if is_using_scikit_build_core; then
-        local bin_dir;
-        bin_dir="$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")";
-        pip_args+=("--config-settings=build-dir=${bin_dir}");
+        pip_args+=("--config-settings=build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
     fi
 
     pip_args+=("--no-build-isolation");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index b8dc0f7af..c83c5231b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -142,13 +142,14 @@ build_${PY_LIB}_python_wheel() {
         pip_args+=("--no-use-pep517");
     fi
 
-    if test -n "${no_build_isolation:-}"; then
-        pip_args+=("--no-build-isolation");
-        if is_using_scikit_build_core; then
-            local -r bin_dir="$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")";
-            pip_args+=("--config-settings=build-dir=${bin_dir}");
-        fi
-    fi
+    case "${no_build_isolation:-$(pip config get wheel.no-build-isolation || echo)}" in
+        True|true|yes||1)
+            pip_args+=("--no-build-isolation");
+            if is_using_scikit_build_core; then
+                pip_args+=("--config-settings=build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
+            fi
+            ;;
+    esac
 
     if test -n "${ignore_requires_python:-}"; then
         pip_args+=("--ignore-requires-python");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index 402efbe64..be97a7120 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -34,9 +34,9 @@ clean_${PY_LIB}_python() {
         "${PY_SRC}"/{${py_lib},${py_lib//"-"/"_"}}.egg-info \
         2>/dev/null || true;
 
-    for lib in ${py_lib} ${py_lib//"-"/"_"}; do
-        if test -d "${PY_SRC}"/${lib}/; then
-            find "${PY_SRC}"/${lib}/ -type f \
+    for lib in "${py_lib}" "${py_lib//"-"/"_"}"; do
+        if test -d "${PY_SRC}/${lib}/"; then
+            find "${PY_SRC}/${lib}/" -type f \
                 -iname "*.cpython-*-$(uname -m)-$(uname -s)-*.so" \
                 -delete;
         fi
@@ -45,7 +45,7 @@ clean_${PY_LIB}_python() {
     local py_ver="${PYTHON_VERSION:-$(python3 --version 2>&1 | cut -d' ' -f2)}";
     py_ver="$(grep -o '^[0-9]*.[0-9]*' <<< "${py_ver}")";
 
-    if test -d "${PY_SRC}"/build; then
+    if test -d "${PY_SRC}/build"; then
         local slug="$(uname -s)-$(uname -m)";
         rm -rf --                                                                                   \
             `# scikit-buld-core build dirs`                                                         \

From 3b7b3d98ea4132218b40b9139fd8f9296b56dabc Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 01:39:28 -0800
Subject: [PATCH 123/217] fix bad merge

---
 .../utils/opt/devcontainer/bin/vault/s3/init.sh  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index c1aed55ad..8faab0654 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -1,23 +1,7 @@
 #! /usr/bin/env bash
 
-<<<<<<< HEAD
 s3_cred() {
     sed -n "s/$1=//p" ~/.aws/credentials 2>/dev/null;
-=======
-s3_bucket_args() {
-    cat <<____EOF
-        --bucket='${SCCACHE_BUCKET:-}'
-        --region='${SCCACHE_REGION:-"${AWS_DEFAULT_REGION:-}"}'
-____EOF
-}
-
-s3_bucket_auth() {
-    cat <<____EOF
-        --aws_access_key_id='$(sed -n 's/aws_access_key_id=//p' ~/.aws/credentials 2>/dev/null)'
-        --aws_session_token='$(sed -n 's/aws_session_token=//p' ~/.aws/credentials 2>/dev/null)'
-        --aws_secret_access_key='$(sed -n 's/aws_secret_access_key=//p' ~/.aws/credentials 2>/dev/null)'
-____EOF
->>>>>>> 8de2d6631671f189a4d739e212f533dbd26f9551
 }
 
 init_vault_s3_creds() {

From 6370387e9213e0cbbf05720747f5456435e47422 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 01:51:46 -0800
Subject: [PATCH 124/217] fix typo

---
 .../opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index c83c5231b..17a0f5b55 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -143,7 +143,7 @@ build_${PY_LIB}_python_wheel() {
     fi
 
     case "${no_build_isolation:-$(pip config get wheel.no-build-isolation || echo)}" in
-        True|true|yes||1)
+        True|true|yes|1)
             pip_args+=("--no-build-isolation");
             if is_using_scikit_build_core; then
                 pip_args+=("--config-settings=build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");

From e478ec627fe63e26e7ca7c86c7cfcded94e2d2ed Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 01:56:02 -0800
Subject: [PATCH 125/217] ignore stderr

---
 .../opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 17a0f5b55..be82c6859 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -142,7 +142,7 @@ build_${PY_LIB}_python_wheel() {
         pip_args+=("--no-use-pep517");
     fi
 
-    case "${no_build_isolation:-$(pip config get wheel.no-build-isolation || echo)}" in
+    case "${no_build_isolation:-$(pip config get wheel.no-build-isolation 2>/dev/null || echo)}" in
         True|true|yes|1)
             pip_args+=("--no-build-isolation");
             if is_using_scikit_build_core; then

From 8094cf2c1e859faa7c9f4b92607fb71e398da7cb Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 9 Feb 2024 13:38:55 -0800
Subject: [PATCH 126/217] always build with --pull, add files.watcherExclude
 and search.exclude, install more system-level dependencies in pip
 devcontainers

---
 .../cuda11.8-conda/devcontainer.json          | 23 ++++++++++++++++++-
 .devcontainer/cuda11.8-pip/devcontainer.json  | 23 ++++++++++++++++++-
 .../cuda12.0-conda/devcontainer.json          | 23 ++++++++++++++++++-
 .devcontainer/cuda12.0-pip/devcontainer.json  | 23 ++++++++++++++++++-
 .devcontainer/rapids.Dockerfile               | 14 ++++++++++-
 5 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
index 558ac4f6f..ad3405e0d 100644
--- a/.devcontainer/cuda11.8-conda/devcontainer.json
+++ b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -2,6 +2,7 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
+    "options": ["--pull"],
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "conda",
@@ -46,7 +47,27 @@
       "extensions": [
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
-      ]
+      ],
+      "files.watcherExclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/target/**": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      },
+      "search.exclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/*.code-search": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      }
     }
   }
 }
diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index ac6f4ac53..0d2f0d83a 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -2,6 +2,7 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
+    "options": ["--pull"],
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "pip",
@@ -49,7 +50,27 @@
       "extensions": [
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
-      ]
+      ],
+      "files.watcherExclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/target/**": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      },
+      "search.exclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/*.code-search": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      }
     }
   }
 }
diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
index 4734a1491..ed8417428 100644
--- a/.devcontainer/cuda12.0-conda/devcontainer.json
+++ b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -2,6 +2,7 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
+    "options": ["--pull"],
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "conda",
@@ -46,7 +47,27 @@
       "extensions": [
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
-      ]
+      ],
+      "files.watcherExclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/target/**": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      },
+      "search.exclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/*.code-search": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      }
     }
   }
 }
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index 27a746c1c..f54bd9cfc 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -2,6 +2,7 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
+    "options": ["--pull"],
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "pip",
@@ -49,7 +50,27 @@
       "extensions": [
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
-      ]
+      ],
+      "files.watcherExclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/target/**": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      },
+      "search.exclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/*.code-search": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      }
     }
   }
 }
diff --git a/.devcontainer/rapids.Dockerfile b/.devcontainer/rapids.Dockerfile
index 2400d6aa9..bbdabfd64 100644
--- a/.devcontainer/rapids.Dockerfile
+++ b/.devcontainer/rapids.Dockerfile
@@ -7,10 +7,22 @@ FROM ${BASE} as pip-base
 
 RUN apt update -y \
  && DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    # C++ build tools
+    doxygen \
+    graphviz \
+    # C++ test dependencies
+    libgmock-dev \
+    libgtest-dev \
     # needed by libcudf_kafka
     librdkafka-dev \
+    # cuML/cuGraph dependencies
+    libblas-dev \
+    liblapack-dev \
     # needed by libcuspatial
-    sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev \
+    sqlite3 \
+    libsqlite3-dev \
+    libtiff-dev \
+    libcurl4-openssl-dev \
  && rm -rf /tmp/* /var/tmp/* /var/cache/apt/* /var/lib/apt/lists/*;
 
 ENV DEFAULT_VIRTUAL_ENV=rapids

From 89c2e355424f3cd1973fabfbfba86cf829dd878c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 11:04:51 -0800
Subject: [PATCH 127/217] Regnerate creds every 8 hours and echo the timestamp
 to the cron log

---
 USAGE.md                                                      | 2 +-
 .../src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh | 4 ++--
 .../src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh | 2 +-
 .../src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/USAGE.md b/USAGE.md
index f1379831a..178221aba 100644
--- a/USAGE.md
+++ b/USAGE.md
@@ -62,7 +62,7 @@ VAULT_HOST="https://vault.ops.k8s.rapids.ai"
 VAULT_GITHUB_ORGS="nvidia nv-morpheus nv-legate rapids"
 
 # The TTL for the generated AWS credentials
-VAULT_S3_TTL=43200
+VAULT_S3_TTL=28800
 
 # The URI to the Vault API that generates AWS credentials
 # The full URL expands to `$VAULT_HOST/$VAULT_S3_URI?ttl=$VAULT_S3_TTL`
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index d0120ce87..e8706ac3c 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -53,9 +53,9 @@ generate_s3_creds() {
     fi
 
     echo ""
+    echo "$(date)";
     echo "Attempting to use your GitHub account to authenticate";
     echo "with vault at '${VAULT_HOST}'.";
-    echo ""
 
     local vault_token="null";
 
@@ -70,7 +70,7 @@ generate_s3_creds() {
     echo "Successfully authenticated with vault!";
 
     local -r generated_at="$(date '+%s')";
-    local ttl="${VAULT_S3_TTL:-"43200"}";
+    local ttl="${VAULT_S3_TTL:-"28800"}";
     local uri="${VAULT_S3_URI:-"v1/aws/creds/devs"}";
 
     if grep -qE '^[0-9]$' <<< "${ttl}"; then
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index 19220ad82..e16ca4b07 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -13,7 +13,7 @@ schedule_s3_creds_refresh() {
     fi
 
     local -r now="$(date '+%s')";
-    local ttl="${VAULT_S3_TTL:-"43200"}";
+    local ttl="${VAULT_S3_TTL:-"28800"}";
     ttl="${ttl%s}";
 
     local -r stamp="$(cat ~/.aws/stamp 2>/dev/null || echo "${now}")";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
index 23da9317a..c0d0381a6 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -19,7 +19,7 @@ test_aws_creds() {
     if test -f ~/.aws/stamp; then
         local -r now="$(date '+%s')";
         local -r stamp="$(cat ~/.aws/stamp)";
-        local ttl="${VAULT_S3_TTL:-"43200"}";
+        local ttl="${VAULT_S3_TTL:-"28800"}";
         if [ $((now - stamp)) -ge "${ttl%s}" ]; then
             exit 1;
         fi

From 0a6b2734b1c846d70dd9f1c314301ac40a2af650 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 11:12:33 -0800
Subject: [PATCH 128/217] consolidate xtrace logic into debug-output.sh

---
 .../bin/python-pkg-names.sh                   |  3 +++
 .../bin/python-pkg-roots.sh                   |  3 +++
 .../rapids-build-utils/bin/query-manifest.sh  |  8 ++----
 .../bin/tmpl/all.build.tmpl.sh                |  8 ++----
 .../bin/tmpl/all.clean.tmpl.sh                | 14 ++++-------
 .../bin/tmpl/all.clone.tmpl.sh                | 14 ++++-------
 .../bin/tmpl/all.configure.tmpl.sh            |  8 ++----
 .../bin/tmpl/all.cpack.tmpl.sh                | 14 ++++-------
 .../bin/tmpl/all.install.tmpl.sh              |  8 ++----
 .../rapids-build-utils/bin/tmpl/all.tmpl.sh   |  8 ++----
 .../bin/tmpl/all.uninstall.tmpl.sh            |  8 ++----
 .../bin/tmpl/cpp.build.tmpl.sh                |  9 ++-----
 .../bin/tmpl/cpp.clean.tmpl.sh                |  9 ++-----
 .../bin/tmpl/cpp.configure.tmpl.sh            | 10 ++------
 .../bin/tmpl/cpp.cpack.tmpl.sh                | 10 ++------
 .../bin/tmpl/cpp.install.tmpl.sh              |  9 ++-----
 .../bin/tmpl/cpp.uninstall.tmpl.sh            |  9 ++-----
 .../bin/tmpl/python.build.editable.tmpl.sh    | 11 ++------
 .../bin/tmpl/python.build.tmpl.sh             |  9 ++-----
 .../bin/tmpl/python.build.wheel.tmpl.sh       | 11 ++------
 .../bin/tmpl/python.clean.tmpl.sh             |  9 ++-----
 .../bin/tmpl/python.uninstall.tmpl.sh         |  9 ++-----
 .../bin/tmpl/repo.build.tmpl.sh               |  9 ++-----
 .../bin/tmpl/repo.clean.tmpl.sh               |  9 ++-----
 .../bin/tmpl/repo.clone.tmpl.sh               |  9 ++-----
 .../bin/tmpl/repo.configure.tmpl.sh           |  9 ++-----
 .../bin/tmpl/repo.cpack.tmpl.sh               |  9 ++-----
 .../bin/tmpl/repo.install.tmpl.sh             |  9 ++-----
 .../bin/tmpl/repo.uninstall.tmpl.sh           |  9 ++-----
 features/src/utils/install.sh                 |  1 +
 .../bin/bash/generate-bash-completion.sh      | 12 ++++-----
 .../opt/devcontainer/bin/debug-output.sh      | 25 +++++++++++++++++++
 .../utils/opt/devcontainer/bin/git/init.sh    |  2 --
 .../opt/devcontainer/bin/git/repo/clone.sh    |  9 ++-----
 .../opt/devcontainer/bin/github/repo/clone.sh | 11 +++-----
 .../opt/devcontainer/bin/gitlab/repo/clone.sh | 10 +++-----
 .../devcontainer/bin/shell-is-interactive.sh  |  2 --
 .../devcontainer/bin/ssh/init-deploy-keys.sh  |  8 ++----
 .../opt/devcontainer/bin/vault/auth/github.sh |  8 ++----
 .../bin/vault/s3/creds/generate.sh            |  9 ++-----
 .../bin/vault/s3/creds/persist.sh             |  9 ++-----
 .../bin/vault/s3/creds/propagate.sh           |  9 ++-----
 .../bin/vault/s3/creds/schedule.sh            |  9 ++-----
 .../devcontainer/bin/vault/s3/creds/test.sh   |  9 ++-----
 .../opt/devcontainer/bin/vault/s3/init.sh     |  9 ++-----
 45 files changed, 124 insertions(+), 282 deletions(-)
 create mode 100755 features/src/utils/opt/devcontainer/bin/debug-output.sh

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index cce87fc98..4f84414a6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -24,6 +24,9 @@ python_pkg_names() {
 
     eval "$(rapids-list-repos "$@")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'python-pkg-names';
+
     local i;
     local j;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index ca3ea4917..7a9ebae46 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -24,6 +24,9 @@ python_pkg_roots() {
 
     eval "$(rapids-list-repos "$@")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'python-pkg-roots';
+
     local i;
     local j;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index a7400b73b..3fcae5487 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -16,14 +16,10 @@ query_manifest() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"query-manifest"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'query-manifest';
 
     local manifest="${m:-${manifest:-"${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"}"}}";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
index 1165a26f4..3285235c3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -30,14 +30,10 @@ build_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all';
 
     for name in ${NAMES}; do
         if type build-${name} >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index 97e5f3e06..774c28e41 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -18,21 +18,17 @@ clean_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"clean-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
     ' - <<< "${@@Q}")";
 
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
 
-    echo "${NAMES}"                     \
-  | tr '[:space:]' '\0'                 \
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all';
+
+    echo ${NAMES} \
+  | tr '[:space:]' '\0' \
   | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
     if type clean-% >/dev/null 2>&1; then
         clean-% ${OPTS[*]} || exit 255;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 724925af6..39cd229f1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -23,13 +23,6 @@ clone_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"clone-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         --no-fork
         --clone-upstream
@@ -37,8 +30,11 @@ clone_all() {
 
     eval "$(rapids-get-num-archs-jobs-and-load -a3 "$@")";
 
-    echo "${NAMES}"                     \
-  | tr '[:space:]' '\0'                 \
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all';
+
+    echo ${NAMES} \
+  | tr '[:space:]' '\0' \
   | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
     if type clone-% >/dev/null 2>&1; then
         clone-% -j ${n_arch} --no-update-env ${OPTS[*]} || exit 255;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
index 74ee50e0e..9db52cdfc 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
@@ -27,14 +27,10 @@ configure_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"configure-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all';
 
     for name in ${NAMES}; do
         if type configure-${name} >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index f7c85924c..f47c56afd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -27,13 +27,6 @@ cpack_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"cpack-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
         --component
@@ -48,8 +41,11 @@ cpack_all() {
 
     eval "$(rapids-get-num-archs-jobs-and-load -j "${j}" -a "${k}" --max-archs "${k}")";
 
-    echo "${NAMES}"                     \
-  | tr '[:space:]' '\0'                 \
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all';
+
+    echo ${NAMES} \
+  | tr '[:space:]' '\0' \
   | xargs -r -0 -P${n_load} -I% bash -c "
     if type cpack-% >/dev/null 2>&1; then
         cpack-% -j ${n_arch} ${OPTS[*]} || exit 255;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
index c1b1ba8bf..742699bc9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
@@ -25,14 +25,10 @@ install_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"install-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'install-all';
 
     for name in ${NAMES}; do
         if type install-${name} >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
index 69b95d03a..941b5853f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
@@ -15,14 +15,10 @@ ${SCRIPT}_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"${SCRIPT}-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' '${SCRIPT}-all';
 
     for name in ${NAMES}; do
         if type ${SCRIPT}-${name} >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
index 92a947044..fa398b847 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
@@ -15,14 +15,10 @@ uninstall_all() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all';
 
     for name in ${NAMES}; do
         if type uninstall-${name} >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index 7c7f06530..ad576c258 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -26,15 +26,10 @@ build_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-${CPP_LIB}-cpp"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${CPP_LIB}-cpp';
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index edd648e4a..522b64687 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -12,15 +12,10 @@ clean_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"clean-${CPP_LIB}-cpp"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME} clean-${CPP_LIB}-cpp';
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 3619a071b..fa9240aef 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -26,14 +26,6 @@ configure_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"configure-${CPP_LIB}-cpp"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
@@ -51,6 +43,8 @@ configure_${CPP_LIB}_cpp() {
     cmake_args+=(${CPP_ARGS});
     cmake_args+=("${v:+--log-level=VERBOSE}");
     cmake_args+=("${OPTS[@]}");
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all configure-${NAME} configure-${CPP_LIB}-cpp';
 
     local -r bin_dir="$(rapids-get-cmake-build-dir "${CPP_SRC}" "${cmake_args[@]}")";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 5664df2ce..21e7a0cfd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -24,14 +24,6 @@ cpack_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"cpack-${CPP_LIB}-cpp"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
         --strip
@@ -44,6 +36,8 @@ cpack_${CPP_LIB}_cpp() {
     fi
 
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all cpack-${NAME} cpack-${CPP_LIB}-cpp';
 
     test ${#component[@]} -eq 0 && component=(all);
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index 1f32cb9f4..633330155 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -23,13 +23,6 @@ install_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"install-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"install-${CPP_LIB}-cpp"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -v,--verbose
@@ -37,6 +30,8 @@ install_${CPP_LIB}_cpp() {
         --config
         --default-directory-permissions
     ' - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'install-all install-${NAME} install-${CPP_LIB}-cpp';
 
     test ${#component[@]} -eq 0 && component=(all);
     prefix="${p:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 5f0ebf35e..f1049e99b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -13,15 +13,10 @@ uninstall_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"uninstall-${CPP_LIB}-cpp"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME} uninstall-${CPP_LIB}-cpp';
 
     if test -f "${CPP_SRC}/${BIN_DIR}/install_manifest.txt"; then
         time (
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index bffa23071..14ae0d63d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -33,15 +33,6 @@ build_${PY_LIB}_python_editable() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-editable"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
@@ -54,6 +45,8 @@ build_${PY_LIB}_python_editable() {
     )";
 
     local cmake_args=(${PY_CMAKE_ARGS});
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-editable';
 
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
index 81ef58ba8..7f8ffec42 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
@@ -50,17 +50,12 @@ build_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" --take '
         -t,--type
     ' - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python';
 
     build-${PY_LIB}-python-${t:-${type:-"editable"}} "${OPTS[@]}";
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index be82c6859..4dbf73306 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -55,15 +55,6 @@ build_${PY_LIB}_python_wheel() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-${PY_LIB}-python-wheel"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     if [[ ! -d "${PY_SRC}" ]]; then
@@ -76,6 +67,8 @@ build_${PY_LIB}_python_wheel() {
     )";
 
     local cmake_args=(${PY_CMAKE_ARGS});
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-wheel';
 
     cmake_args+=(${CMAKE_ARGS:-});
     cmake_args+=(${CPP_DEPS});
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index be97a7120..b9313bfc5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -12,15 +12,10 @@ clean_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"clean-${PY_LIB}-python"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME} clean-${PY_LIB}-python';
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index 2c64a92c4..9c3ea222c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -13,15 +13,10 @@ uninstall_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"uninstall-${PY_LIB}-python"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME} uninstall-${PY_LIB}-python';
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
index 4dd279efc..f008d2193 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
@@ -28,17 +28,12 @@ build_${NAME}() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"build-${NAME}"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" --take '
         -t,--type
     ' - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type build-${lib}-cpp >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
index 398f6b243..8737ee389 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
@@ -12,15 +12,10 @@ clean_${NAME}() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"clean-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"clean-${NAME}"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type clean-${lib}-cpp >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index f66ce8754..e075d3dd6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -29,13 +29,6 @@ clone_${NAME}() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"clone-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"clone-${NAME}"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
@@ -44,6 +37,8 @@ clone_${NAME}() {
     ' - <<< "${@@Q}")";
 
     if [[ ! -d "${SRC_PATH}"/.git ]]; then
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all clone-${NAME}';
 
         eval "$(rapids-get-num-archs-jobs-and-load "$@")";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
index 591a65279..3a756cf55 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
@@ -27,15 +27,10 @@ configure_${NAME}() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"configure-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"configure-${NAME}"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all configure-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type configure-${lib}-cpp >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
index 25cb14ee4..cd96f11e7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
@@ -19,15 +19,10 @@ cpack_${NAME}() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"cpack-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"cpack-${NAME}"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all cpack-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type cpack-${lib}-cpp >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
index d232b6a4f..c4811db53 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
@@ -23,15 +23,10 @@ install_${NAME}() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"install-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"install-${NAME}"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'install-all install-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type install-${lib}-cpp >/dev/null 2>&1; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index 0c7ca1a90..b85ca867e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -13,15 +13,10 @@ uninstall_${NAME}() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"uninstall-all"*}" \
-      || test -z "${rapids_build_utils_debug##*"uninstall-${NAME}"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type uninstall-${lib}-cpp >/dev/null 2>&1; then
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index e90f9a9bd..ffa61ffa6 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -76,6 +76,7 @@ install_utility() {
 # Install alternatives
 
 # Install these first since we use it in `install_utility`
+update-alternatives --install /usr/bin/devcontainer-utils-debug-output              devcontainer-utils-debug-output              /opt/devcontainer/bin/debug-output.sh                  0;
 update-alternatives --install /usr/bin/devcontainer-utils-parse-args                devcontainer-utils-parse-args                /opt/devcontainer/bin/parse-args.sh                    0;
 update-alternatives --install /usr/bin/devcontainer-utils-parse-args-from-docstring devcontainer-utils-parse-args-from-docstring /opt/devcontainer/bin/parse-args-from-docstring.sh     0;
 update-alternatives --install /usr/bin/devcontainer-utils-bash-completion.tmpl      devcontainer-utils-bash-completion.tmpl      /opt/devcontainer/bin/bash/completion.tmpl.sh          0;
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index cbb74dbe3..53cfa15ce 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -20,14 +20,12 @@ generate_bash_completion() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"generate-bash-completion"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    local -r utils="$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/..";
+
+    eval "$("${utils}/parse-args.sh" "$0" "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . "${utils}/debug-output.sh" 'devcontainer_utils_debug' 'generate-bash-completion';
 
     command="${c:?-c|--command is required}";
     out_dir="$(realpath -m "${o:-"${HOME}/.bash_completion.d"}")";
diff --git a/features/src/utils/opt/devcontainer/bin/debug-output.sh b/features/src/utils/opt/devcontainer/bin/debug-output.sh
new file mode 100755
index 000000000..ce39e9c94
--- /dev/null
+++ b/features/src/utils/opt/devcontainer/bin/debug-output.sh
@@ -0,0 +1,25 @@
+#! /usr/bin/env bash
+
+{ set +x; } 2>/dev/null;
+
+for var in ${1}; do
+    var="${!var:-}";
+    if test -n "${var:-}"; then
+        for str in '*' ${2}; do
+            if test -z "${var##*"${str}"*}"; then
+                __xtrace=1;
+                break;
+            fi
+        done
+        unset str;
+    fi
+    shift;
+done
+shift;
+unset var;
+
+if test -n "${__xtrace:-}"; then
+    unset __xtrace;
+    PS4="+ ${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}:\${LINENO} ";
+    set -x;
+fi
diff --git a/features/src/utils/opt/devcontainer/bin/git/init.sh b/features/src/utils/opt/devcontainer/bin/git/init.sh
index 1b91aa9b0..e754e4148 100755
--- a/features/src/utils/opt/devcontainer/bin/git/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/init.sh
@@ -4,8 +4,6 @@ init_git_cli_config() {
     local -;
     set -euo pipefail;
 
-    # PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-
     if ! test -f ~/.gitconfig; then
         if test -f ~/.gitconfig.default; then
             cp -a ~/.gitconfig{.default,};
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 07f4d4e64..0077c2ba5 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -22,15 +22,10 @@ clone_git_repo() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"clone"*}" \
-      || test -z "${devcontainer_utils_debug##*"clone-git-repo"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'clone clone-git-repo';
 
     if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
 
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 883bfe93b..865c06d0d 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -85,19 +85,14 @@ clone_github_repo() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"clone"*}" \
-      || test -z "${devcontainer_utils_debug##*"clone-github-repo"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
         -j,--jobs,--parallel
     ' - <<< "${@@Q}")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'clone clone-github-repo';
+
     if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
 
     local upstream="${REST[0]:?"fatal: missing required positional argument <upstream>"}";
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index c72aae6cf..8f280c5b6 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -115,6 +115,9 @@ clone_gitlab_repo() {
         -j,--jobs,--parallel
     ' - <<< "${@@Q}")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'clone clone-gitlab-repo';
+
     if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
 
     local upstream="${REST[0]:?"fatal: missing required positional argument <upstream>"}";
@@ -191,11 +194,4 @@ clone_gitlab_repo() {
         ;
 }
 
-if test -n "${devcontainer_utils_debug:-}" \
-&& { test -z "${devcontainer_utils_debug##*"*"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone"*}" \
-  || test -z "${devcontainer_utils_debug##*"clone-gitlab-repo"*}"; }; then
-    PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-fi
-
 clone_gitlab_repo "$@";
diff --git a/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh b/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh
index 7b159bf83..1becb26ef 100755
--- a/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh
+++ b/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh
@@ -1,7 +1,5 @@
 #! /usr/bin/env bash
 
-# PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-
 if (exec < /dev/tty) && [ "${CODESPACES:-false}" != "true" ]; then
     exit 0;
 fi
diff --git a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
index 9e28c4f81..968b8ce3a 100755
--- a/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
+++ b/features/src/utils/opt/devcontainer/bin/ssh/init-deploy-keys.sh
@@ -4,12 +4,8 @@ init_ssh_deploy_keys() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"init-deploy-keys"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'init-deploy-keys';
 
     local re="(ssh:\/\/|https:\/\/)?(git@)?(.*\.com)[:\/](.*)";
     local line;
diff --git a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
index f48bd0796..53a826a52 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/auth/github.sh
@@ -5,12 +5,8 @@ get_vault_token() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-auth-github"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-auth-github';
 
     local -r VAULT_HOST="$1";
     local -r user_orgs=("${@:2}");
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index e8706ac3c..43e2d4c64 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -6,13 +6,8 @@ generate_s3_creds() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-generate"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-s3-creds-generate';
 
     if test -z "${VAULT_HOST:-}" \
     || test -z "${SCCACHE_BUCKET:-}"; then
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index 372f891b5..d00fc180a 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -33,15 +33,10 @@ persist_s3_creds() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-persist"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args devcontainer-utils-vault-s3-creds-persist "$@" <&0)";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-s3-creds-persist';
 
     # Reset envvars
     reset_envvar "SCCACHE_BUCKET";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
index f330c89f7..41e916049 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/propagate.sh
@@ -4,13 +4,8 @@ ensure_s3_creds_have_propagated() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-propagate"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-s3-creds-propagate';
 
     if ! type sccache >/dev/null 2>&1; then
         return;
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index e16ca4b07..17dfb91d3 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -4,13 +4,8 @@ schedule_s3_creds_refresh() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-schedule"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-s3-creds-schedule';
 
     local -r now="$(date '+%s')";
     local ttl="${VAULT_S3_TTL:-"28800"}";
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
index c0d0381a6..78ed06827 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/test.sh
@@ -6,13 +6,8 @@ test_aws_creds() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3-creds-test"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-s3-creds-test';
 
     if ! type sccache >/dev/null 2>&1; then exit 1; fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
index 8faab0654..adbfb478c 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/init.sh
@@ -8,13 +8,8 @@ init_vault_s3_creds() {
     local -
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3"*}" \
-      || test -z "${devcontainer_utils_debug##*"vault-s3-init"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-s3-init';
 
     if type sccache >/dev/null 2>&1; then
         if test -n "${SCCACHE_BUCKET:-}"; then

From be9ddfe98dd440030c0f8b70e57738fc4e8566c1 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 13:24:38 -0800
Subject: [PATCH 129/217] consolidate xtrace logic into debug-output.sh

---
 .../bin/checkout-same-branch.sh               | 11 +++-----
 .../bin/generate-scripts.sh                   | 27 +++++--------------
 .../bin/get-cmake-build-dir.sh                |  3 +++
 .../bin/get-num-archs-jobs-and-load.sh        |  8 ++----
 .../opt/rapids-build-utils/bin/list-repos.sh  |  8 ++----
 .../bin/make-conda-dependencies.sh            |  8 ++----
 .../rapids-build-utils/bin/make-conda-env.sh  |  9 +++----
 .../bin/make-pip-dependencies.sh              |  8 ++----
 .../rapids-build-utils/bin/make-pip-env.sh    | 10 +++----
 .../bin/make-vscode-workspace.sh              |  8 ++----
 .../bin/pull-repositories.sh                  | 10 +++----
 .../bin/push-repositories.sh                  | 10 +++----
 .../bin/python-conda-pkg-names.sh             | 10 +++----
 13 files changed, 38 insertions(+), 92 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 2036fd221..33026e7dc 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -23,14 +23,6 @@ checkout_same_branch() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"checkout-same-branch"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(                                        \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}      \
@@ -39,6 +31,9 @@ checkout_same_branch() {
 
     eval "$(rapids-list-repos "$@")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'checkout-same-branch';
+
     echo "Determining available branches...";
 
     local repo_names=();
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 095ce8089..e84201eaa 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -10,12 +10,8 @@ clean_completions() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-        || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
 
     mkdir -p "${TMP_SCRIPT_DIR}";
     mkdir -p "${HOME}/.bash_completion.d";
@@ -35,13 +31,6 @@ generate_completions() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-        || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     mkdir -p "${HOME}/.bash_completion.d";
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
 
@@ -60,6 +49,8 @@ generate_completions() {
         done
     fi
 }
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
 
 clean_scripts() {
     local -;
@@ -199,13 +190,6 @@ generate_scripts() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-        || test -z "${rapids_build_utils_debug##*"generate-scripts"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     # Generate and install the "clone-<repo>" scripts
 
     # Ensure we're in this script's directory
@@ -213,6 +197,9 @@ generate_scripts() {
 
     eval "$(rapids-list-repos "$@")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
+
     local -A cpp_name_to_path;
 
     local i;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
index ebc403ddc..961b0a7d8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -23,6 +23,9 @@ get_cmake_build_dir() {
     local -;
     set -euo pipefail;
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'get-cmake-build-dir';
+
     local src="${1:-}";
     if test $# -gt 0; then shift; fi;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 6d8c67dbc..20d6cedd8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -29,14 +29,10 @@ get_num_archs_jobs_and_load() {
     local -;
     set -euo pipefail
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"get-num-archs-jobs-and-load"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'get-num-archs-jobs-and-load';
 
     if test ${#j[@]} -gt 0 && test -z "${j:-}"; then
         j=$(nproc);
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 132bab94a..3a2aaf4d3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -20,16 +20,12 @@ list_repos() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"list-repos"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -m,--manifest
     ' - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'list-repos';
 
     local query=".repos | {repos: .}";
     local filters=();
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index e1d9f8b01..695e23f51 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -29,18 +29,14 @@ make_conda_dependencies() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"make-conda-dependencies"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -m,--manifest
         -o,--omit
         --repo
     ' - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-conda-env make-conda-dependencies';
 
     test ${#key[@]} -eq 0 && key=(all);
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index f278e07ae..13c1c96b4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -22,12 +22,9 @@ make_conda_env() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"make-conda-env"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-conda-env';
 
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.yml";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index b7b7e24cd..778df57b5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -31,18 +31,14 @@ make_pip_dependencies() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"make-pip-dependencies"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
 
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -m,--manifest
         -o,--omit
         --repo
     ' - <<< "${@@Q}")";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-pip-env make-pip-dependencies';
 
     test ${#key[@]} -eq 0 && key=(py_build py_run py_test all);
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index a45c36e0a..e4bb59830 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -24,13 +24,6 @@ make_pip_env() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"make-pip-env"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.requirements.txt";
 
@@ -43,6 +36,9 @@ make_pip_env() {
         -r,--requirement
     ' - <<< "${@@Q}")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-pip-env';
+
     # Remove the current virtual env if called with `-f|--force`
     if test -n "${force:-}"; then
         rm -rf "${HOME}/.local/share/venvs/${env_name}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
index f3befbf87..441462e2f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
@@ -75,12 +75,8 @@ make_vscode_workspace() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"make-vscode-workspace"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-vscode-workspace';
 
     cat<<EOF
 {
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 45050ab45..0348d8f93 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -20,17 +20,13 @@ pull_repositories() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"pull-repositories"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-list-repos "$@")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'pull-repositories';
+
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
         local repo="repos_${i}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index 0ef9b3877..deeef8b9f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -20,17 +20,13 @@ push_repositories() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"push-repositories"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-list-repos "$@")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'push-repositories';
+
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
         local repo="repos_${i}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index 29745bc28..1fd15678f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -23,17 +23,13 @@ python_conda_pkg_names() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-      || test -z "${rapids_build_utils_debug##*"python-conda-pkg-names"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
 
     eval "$(rapids-list-repos "$@")";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'python-conda-pkg-names';
+
     local i;
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do

From b5f2c2cd0598262c5b12d55ec4c94dc7f6ed6332 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 13:26:36 -0800
Subject: [PATCH 130/217] add underscores to function names in
 parse-args-from-docstring

---
 .../devcontainer/bin/bash/completion.tmpl.sh  | 16 ++--
 .../bin/parse-args-from-docstring.sh          | 69 ++++++++-----
 .../utils/opt/devcontainer/bin/parse-args.sh  | 96 ++++++++++++-------
 3 files changed, 113 insertions(+), 68 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
index 107014a69..5b1ac6cde 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
@@ -43,19 +43,19 @@ _devcontainer_utils_completions() {
         unset "_devcontainer_utils_completions_option_names[${CMD}]";
     fi
     if ! test -v _devcontainer_utils_completions_usage["${CMD}"]; then
-        _devcontainer_utils_completions_usage["${CMD}"]="$(sed -n '2,/^$/p' "${_devcontainer_utils_completions_script[${CMD}]}" | sed -r 's/^# ?//')";
+        _devcontainer_utils_completions_usage["${CMD}"]="$(${CMD} -h 2>&1)";
         if test ${#_devcontainer_utils_completions_usage[${CMD}]} -eq 0; then return; fi
     fi
     if test "${#_devcontainer_utils_completions_bool_names[${CMD}]}" -eq 0; then
-        _devcontainer_utils_completions_bool_names["${CMD}"]="$(parse_bool_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}")";
+        _devcontainer_utils_completions_bool_names["${CMD}"]="$(_parse_bool_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}")";
     fi
     if test "${#_devcontainer_utils_completions_value_names[${CMD}]}" -eq 0; then
-        _devcontainer_utils_completions_value_names["${CMD}"]="$(parse_value_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}")";
+        _devcontainer_utils_completions_value_names["${CMD}"]="$(_parse_value_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}" | sort -su)";
     fi
     if ! test -v _devcontainer_utils_completions_value_types["${CMD}"]; then
         _devcontainer_utils_completions_value_types["${CMD}"]="$(_zip_names_and_types              \
-            <(parse_value_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}") \
-            <(parse_value_types_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}") \
+            <(_parse_value_names_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}") \
+            <(_parse_value_types_from_usage <<< "${_devcontainer_utils_completions_usage[${CMD}]}") \
         )";
     fi
     if ! test -v _devcontainer_utils_completions_option_names["${CMD}"]; then
@@ -71,7 +71,7 @@ _devcontainer_utils_completions() {
             read -a pair -r <<< "${name_and_type}";
             local name_="${pair[0]}";
             local type_="${pair[1]}";
-            if [[ ${name_} == ${prev}* ]]; then
+            if [[ ${name_} == "${prev}" ]]; then
                 case "${type_}" in
                     "<num>"|"<number>")
                         # shellcheck disable=SC2207
@@ -109,7 +109,7 @@ _devcontainer_utils_completions() {
         done <<< "${_devcontainer_utils_completions_value_types[${CMD}]}";
     fi
 
-    declare -a bools="(${_devcontainer_utils_completions_bool_names[${CMD}]})";
+    local -a bools="(${_devcontainer_utils_completions_bool_names[${CMD}]})";
 
     for ((idx_a=0; idx_a < ${#bools[@]}; idx_a+=1)); do
         if [[ ${bools[$idx_a]} == ${cur}* ]]; then
@@ -119,7 +119,7 @@ _devcontainer_utils_completions() {
         fi
     done
 
-    declare -a value="(${_devcontainer_utils_completions_value_names[${CMD}]})";
+    local -a value="(${_devcontainer_utils_completions_value_names[${CMD}]})";
 
     for ((idx_a=0; idx_a < ${#value[@]}; idx_a+=1)); do
         if [[ ${value[$idx_a]} == ${cur}* ]]; then
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
index 6135e8793..06d7ebf98 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -1,22 +1,31 @@
 #! /usr/bin/env bash
 
-print_usage() {
+_print_usage() {
     local -;
     set -euo pipefail;
+
     local file="${1:-${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}}";
-    if which "${file}"; then file=$(which "${file}"); fi
-    sed -n '2,/^$/p' "${file}" | sed -r 's/^# ?//';
+    if which "${file}" >/dev/null 2>&1; then
+        file=$(which "${file}");
+    fi
+
+    `# optionally remove the shebang if file is a script` \
+    sed -rn '0,/(#\!)?/!p' "${file}"                      \
+    `# take until the end of the topmost comment`         \
+  | sed -nr '1,/^[^#]?$/p'                                \
+    `# strip off the leading octothorps`                  \
+  | sed -r 's/^# ?//';
 }
 
-parse_args_to_names() {
-    cat - \
+_parse_args_to_names() {
+    cat -                           \
   | sed -r 's/--?([^ ,]+)+/\1/g'    \
   | sed -r 's/(,|\|)/ /g'           \
   ;
 }
 
 _squeeze_spaces_in_options() {
-    cat - \
+    cat -                                                      \
     `# Filter for lines that start with 0-4 spaces and a dash` \
   | grep -P '^[ ]{0,4}-[^ ].*$'                                \
     `# squeeze spaces between short and long args (-f, --foo)` \
@@ -24,31 +33,32 @@ _squeeze_spaces_in_options() {
     ;
 }
 
-parse_all_names_from_usage() {
-    cat - \
-  | _squeeze_spaces_in_options \
+_parse_all_names_from_usage() {
+    cat -                                    \
+  | _squeeze_spaces_in_options               \
   | sed -rn 's/^[ ]*(--?[^ *]+)+[^*]*$/\1/p' \
-  | sed -r 's/(,|\|)/ /g' \
+  | sed -r 's/(,|\|)/ /g'                    \
   ;
 }
 
-parse_value_names_from_usage() {
-    cat - \
-  | _squeeze_spaces_in_options \
-  | sed -rn 's/^([ ]*)(--?[^ \*]+|,|_)+[ ]*[<(](.[^)>]*).*$/\2/p' \
-  | sed -r 's/(,|\|)/ /g';
+_parse_value_names_from_usage() {
+    cat -                                                         \
+  | _squeeze_spaces_in_options                                    \
+  | sed -rn 's/^([ ]*)(--?[^ *]+|,|_)+[ ]*[<(](.[^)>]*).*$/\2/p'  \
+  | sed -r 's/(,|\|)/ /g'                                         \
+  ;
 }
 
-parse_value_types_from_usage() {
-    cat - \
+_parse_value_types_from_usage() {
+    cat -                      \
   | _squeeze_spaces_in_options \
-  | sed -rn 's/^[ ]*(--?[^ \*]+|,|_)+[ ]*([<(].[^)>]*)([)>]).*$/\2\3/p';
+  | sed -rn 's/^[ ]*(--?[^ *]+|,|_)+[ ]*([<(].[^)>]*)([)>]).*$/\2\3/p';
 }
 
-parse_bool_names_from_usage() {
+_parse_bool_names_from_usage() {
     # bool names are the complement of `all names` \ `value names`
-    tee >(parse_all_names_from_usage)   \
-        >(parse_value_names_from_usage) \
+    tee >(_parse_all_names_from_usage | sort -su)   \
+        >(_parse_value_names_from_usage | sort -su) \
         1>/dev/null                     \
   | sort -s                             \
   | uniq -u                             \
@@ -78,16 +88,16 @@ _take_short_opts() {
     ;
 }
 
-parse_short_names() {
+_parse_short_names() {
     cat -                                   \
   `# skip the long opts`                    \
   | _take_short_opts                        \
   `# remove the leading -`                  \
-  | sed -r 's/-([^ ,\*]+)+[,\*]?/\1/g'      \
+  | sed -r 's/-([^ ,*]+)+[,*]?/\1/g'        \
     ;
 }
 
-parse_long_names() {
+_parse_long_names() {
     # long opts are the complement of `all opts` \ `short opts`
     tee >(_listify)              \
         >(_take_short_opts)      \
@@ -100,11 +110,18 @@ parse_long_names() {
     ;
 }
 
-parse_aliases() {
+_parse_aliases() {
     cat -                           \
-  | parse_args_to_names             \
+  | _parse_args_to_names            \
   | while read -r aliases; do
         local -a ary="(${aliases})";
         echo "[${ary[0]}]=\"${ary[*]:1}\"";
     done
 }
+
+if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = parse-args-from-docstring.sh ] \
+|| [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = devcontainer-utils-parse-args-from-docstring ]; then
+    if test $# -gt 0; then
+        _print_usage "$@";
+    fi
+fi
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 8aaff9c24..468cfabb1 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -3,18 +3,15 @@
 # shellcheck disable=SC1091
 . "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/parse-args-from-docstring.sh";
 
-parse_args() {
+_parse_args_for_file() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${devcontainer_utils_debug:-}" \
-    && { test -z "${devcontainer_utils_debug##*"*"*}" \
-      || test -z "${devcontainer_utils_debug##*"parse-args"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
+    # shellcheck disable=SC1091
+    . "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/debug-output.sh" \
+        'devcontainer_utils_debug' 'parse-args';
 
-    local -r usage="$(print_usage "${1:-}")";
+    local -r usage="$(_print_usage "${1:-}")";
     shift;
 
     local idx;
@@ -23,26 +20,14 @@ parse_args() {
     local val;
     local -a arg;
 
-    local -A _map=();
-    local -a args=();
-    local -a opts=();
-    local -A typs=();
-    local -a rest=();
-
     local -A take_map=();
     local -A skip_map=();
-    local -A reverse_alias_map=();
-    local -Ar alias_map="($(parse_all_names_from_usage     <<< "${usage}" | parse_aliases))";
-    local -ar long_bools="($(parse_bool_names_from_usage   <<< "${usage}" | parse_long_names))";
-    local -ar long_value="($(parse_value_names_from_usage  <<< "${usage}" | parse_long_names))";
-    local -ar short_bools="($(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names))";
-    local -ar short_value="($(parse_value_names_from_usage <<< "${usage}" | parse_short_names))";
 
     for ((idx=0; idx < 2; idx+=1)); do
         if [ "${1:-}" = "--take" ]; then
             shift;
             if test -n "${1:-}"; then
-                local -ar take="($(echo "${1}" | parse_args_to_names))";
+                local -ar take="($(_parse_args_to_names <<< "${1}" | tr '\n' ' ' | tr -s '[:blank:]'))";
                 for key in "${take[@]}"; do
                     # shellcheck disable=SC2034
                     take_map["${key}"]=1;
@@ -53,7 +38,7 @@ parse_args() {
         if [ "${1:-}" = "--skip" ]; then
             shift;
             if test -n "${1:-}"; then
-                local -ar skip="($(echo "${1}" | parse_args_to_names))";
+                local -ar skip="($(_parse_args_to_names <<< "${1}" | tr '\n' ' ' | tr -s '[:blank:]'))";
                 for key in "${skip[@]}"; do
                     # shellcheck disable=SC2034
                     skip_map["${key}"]=1;
@@ -63,6 +48,27 @@ parse_args() {
         fi
     done
 
+    # Quick early exit for `-h,--help`
+    if [[ " $* " == *" -h "* ]] || [[ " $* " == *" --help "* ]]; then
+        cat <<< "${usage}" >&2;
+        echo >&2;
+        echo "exit 0";
+        return;
+    fi
+
+    local -A _map=();
+    local -a args=();
+    local -a opts=();
+    local -A typs=();
+    local -a rest=();
+
+    local -A reverse_alias_map=();
+    local -Ar alias_map="($(_parse_all_names_from_usage     <<< "${usage}" | _parse_aliases))";
+    local -ar long_bools="($(_parse_bool_names_from_usage   <<< "${usage}" | _parse_long_names))";
+    local -ar long_value="($(_parse_value_names_from_usage  <<< "${usage}" | _parse_long_names))";
+    local -ar short_bools="($(_parse_bool_names_from_usage  <<< "${usage}" | _parse_short_names))";
+    local -ar short_value="($(_parse_value_names_from_usage <<< "${usage}" | _parse_short_names))";
+
     if test ${#take_map[@]} -eq 0; then
         for key in "${long_bools[@]}" "${short_bools[@]}" \
                    "${long_value[@]}" "${short_value[@]}"; do
@@ -71,6 +77,8 @@ parse_args() {
     fi
 
     # Always include the -h,--help flags
+    typs["h"]="bool";
+    typs["help"]="bool";
     take_map["h"]=1;
     take_map["help"]=1;
 
@@ -86,8 +94,8 @@ parse_args() {
     for key in "${long_value[@]}" "${short_value[@]}"; do typs[${key}]="value"; done
 
     local -r optstring="$(                                                                               \
-        cat <(parse_bool_names_from_usage  <<< "${usage}" | parse_short_names | xargs -r -I% echo -n %)  \
-            <(parse_value_names_from_usage <<< "${usage}" | parse_short_names | xargs -r -I% echo -n %:) \
+        cat <(_parse_bool_names_from_usage  <<< "${usage}" | _parse_short_names | xargs -r -I% echo -n %)  \
+            <(_parse_value_names_from_usage <<< "${usage}" | _parse_short_names | xargs -r -I% echo -n %:) \
       | tr -d '[:space:]'                                                                                \
     )";
 
@@ -133,16 +141,21 @@ parse_args() {
                     ;;
                 # unknown short opt
                 \?)
+                    if test "${OPTARG}" == "h"; then
+                        typ="bool";
+                        key="${OPTARG}";
+                        arg+=("-${key}");
                     # Compare ${OPTARG} to ${!idx} with its leading `-`.
                     # This only works when getopts is in silent mode, i.e. when `:` is at the front of the optstring.
                     # If getopts is not in silent mode, it does not populate `OPTARG`.
-                    if [[ "-${OPTARG}" != "${!idx:-}" ]]; then
+                    elif [[ "-${OPTARG}" != "${!idx:-}" ]]; then
                         # Special cases:
                         # -f=foo
                         # -Wno-dev
                         opts+=("${!OPTIND:-}");
                         # Splice the argument at index `OPTIND` out of $@
                         set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
+                        break;
                     else
                         # Normal cases:
                         # -f
@@ -160,8 +173,8 @@ parse_args() {
                             # Splice the argument at index `OPTIND` out of $@
                             set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
                         fi
+                        break;
                     fi
-                    break;
                     ;;
                 # long opt
                 -)
@@ -204,10 +217,16 @@ parse_args() {
                             ;;
                         # unknown long opt with value following
                         *)
-                            opts+=("--${OPTARG}");
-                            if [[ "${!OPTIND:--}" != -* ]]; then
-                                opts+=("${!OPTIND}");
-                                OPTIND=$((OPTIND + 1));
+                            if test "${OPTARG}" == "help"; then
+                                typ="bool";
+                                key="${OPTARG}";
+                                arg+=("--${key}");
+                            else
+                                opts+=("--${OPTARG}");
+                                if [[ "${!OPTIND:--}" != -* ]]; then
+                                    opts+=("${!OPTIND}");
+                                    OPTIND=$((OPTIND + 1));
+                                fi
                             fi
                             ;;
                     esac
@@ -315,17 +334,26 @@ parse_args() {
         echo "declare -a REST=(${rest[*]@Q})";
 
         for key in "${!_map[@]}"; do
+            local k_="${key}";
+            k_="${k_//-/_}";
+            k_="${k_//./_}";
             if test "${typs["${key}"]}" = bool; then
-                echo "declare ${key//-/_}=${_map["${key}"]}";
+                echo "declare ${k_}=${_map["${key}"]}";
             else
-                echo "declare -a ${key//-/_}=(${_map["${key}"]})";
+                echo "declare -a ${k_}=(${_map["${key}"]})";
             fi
             local -a aliases="(${alias_map["${key}"]})";
             for alias in "${aliases[@]}"; do
-                echo "declare -n ${alias//-/_}=${key//-/_}";
+                local a_="${alias}";
+                a_="${a_//-/_}";
+                a_="${a_//./_}";
+                echo "declare -n ${a_}=${k_}";
             done
         done
     fi
 }
 
-parse_args "$@" <&0;
+if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = parse-args.sh ] \
+|| [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = devcontainer-utils-parse-args ]; then
+    _parse_args_for_file "$@" <&0;
+fi

From 7645a18b33a6384b93997fa4265cb596c78b4774 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 13:29:37 -0800
Subject: [PATCH 131/217] update docstrings to inline from other commands

* add rapids-generate-docstrings to inline docstrings from other commands
* clean up feature install scripts
* accept multiple commands in devcontainer-utils-generate-bash-completion
---
 features/src/rapids-build-utils/install.sh    |  82 ++++----
 .../bin/checkout-same-branch.sh               |  17 +-
 .../bin/generate-docstring.sh                 | 178 ++++++++++++++++++
 .../bin/generate-scripts.sh                   | 126 +++++--------
 .../bin/get-cmake-build-dir.sh                |   2 +-
 .../bin/get-num-archs-jobs-and-load.sh        |  17 +-
 .../opt/rapids-build-utils/bin/list-repos.sh  |  14 +-
 .../bin/make-conda-dependencies.sh            |  22 +--
 .../rapids-build-utils/bin/make-conda-env.sh  |  24 +--
 .../bin/make-pip-dependencies.sh              |  20 +-
 .../rapids-build-utils/bin/make-pip-env.sh    |  29 ++-
 .../bin/make-vscode-workspace.sh              |   4 +-
 .../bin/parse-cmake-build-type.sh             |   3 -
 .../bin/parse-pip-install-args.sh             |  40 ----
 .../bin/parse-pip-wheel-args.sh               |  40 ----
 .../bin/parse-valid-args.sh                   |  22 ---
 .../bin/pull-repositories.sh                  |  16 +-
 .../bin/push-repositories.sh                  |  16 +-
 .../bin/python-conda-pkg-names.sh             |  16 +-
 .../bin/python-pkg-names.sh                   |  16 +-
 .../bin/python-pkg-roots.sh                   |  16 +-
 .../rapids-build-utils/bin/query-manifest.sh  |  11 +-
 ...rse-cmake-args.sh => select-cmake-args.sh} |  61 ++----
 .../bin/select-cmake-build-args.sh            |  25 +++
 .../bin/select-cmake-build-type.sh            |   3 +
 ...cmake-define.sh => select-cmake-define.sh} |  13 +-
 .../bin/select-cmake-install-args.sh          |  22 +++
 .../rapids-build-utils/bin/select-cmd-args.sh |  33 ++++
 .../bin/select-pip-install-args.sh            |  15 ++
 .../bin/select-pip-wheel-args.sh              |  15 ++
 .../bin/tmpl/all.build.tmpl.sh                |  32 +---
 .../bin/tmpl/all.clean.tmpl.sh                |  19 +-
 .../bin/tmpl/all.clone.tmpl.sh                |  23 +--
 .../bin/tmpl/all.configure.tmpl.sh            |  30 +--
 .../bin/tmpl/all.cpack.tmpl.sh                |  39 ++--
 .../bin/tmpl/all.install.tmpl.sh              |  27 +--
 .../rapids-build-utils/bin/tmpl/all.tmpl.sh   |  15 +-
 .../bin/tmpl/all.uninstall.tmpl.sh            |  17 +-
 .../bin/tmpl/cpp.build.tmpl.sh                |  44 ++---
 .../bin/tmpl/cpp.clean.tmpl.sh                |   9 +-
 .../bin/tmpl/cpp.configure.tmpl.sh            |  43 ++---
 .../bin/tmpl/cpp.cpack.tmpl.sh                |  55 +++---
 .../bin/tmpl/cpp.install.tmpl.sh              |  41 ++--
 .../bin/tmpl/cpp.uninstall.tmpl.sh            |   9 +-
 .../bin/tmpl/python.build.editable.tmpl.sh    |  61 +++---
 .../bin/tmpl/python.build.tmpl.sh             |  56 ++----
 .../bin/tmpl/python.build.wheel.tmpl.sh       | 130 +++----------
 .../bin/tmpl/python.clean.tmpl.sh             |   9 +-
 .../bin/tmpl/python.uninstall.tmpl.sh         |  13 +-
 .../bin/tmpl/repo.build.tmpl.sh               |  33 ++--
 .../bin/tmpl/repo.clean.tmpl.sh               |  13 +-
 .../bin/tmpl/repo.clone.tmpl.sh               |  89 +++++----
 .../bin/tmpl/repo.configure.tmpl.sh           |  28 +--
 .../bin/tmpl/repo.cpack.tmpl.sh               |  22 ++-
 .../bin/tmpl/repo.install.tmpl.sh             |  25 +--
 .../bin/tmpl/repo.uninstall.tmpl.sh           |  13 +-
 features/src/utils/install.sh                 |  90 +++++----
 .../bin/bash/generate-bash-completion.sh      |  34 ++--
 .../opt/devcontainer/bin/git/repo/clone.sh    |  10 +-
 .../opt/devcontainer/bin/github/repo/clone.sh |  20 +-
 .../opt/devcontainer/bin/gitlab/repo/clone.sh |  18 +-
 .../bin/vault/s3/creds/persist.sh             |   4 +-
 62 files changed, 968 insertions(+), 1021 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-docstring.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/{parse-cmake-args.sh => select-cmake-args.sh} (51%)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-args.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-type.sh
 rename features/src/rapids-build-utils/opt/rapids-build-utils/bin/{parse-cmake-define.sh => select-cmake-define.sh} (66%)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmd-args.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-install-args.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-wheel-args.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 7a07e5b9c..153f04338 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -38,44 +38,50 @@ fi
 
 cp -ar ./opt/rapids-build-utils /opt/;
 
-install_utility() {
-    local cmd="rapids-${1}";
-    local src="${2:-"${1}.sh"}";
-    # Install alternative
-    update-alternatives --install /usr/bin/${cmd} ${cmd} /opt/rapids-build-utils/bin/${src} 0;
-
-    # Install bash_completion script
-    if type devcontainer-utils-generate-bash-completion >/dev/null 2>&1; then
-        devcontainer-utils-generate-bash-completion --command "${cmd}" --out-dir /etc/bash_completion.d;
-    fi
-}
-
-install_utility update-content-command;
-install_utility post-start-command;
-install_utility post-attach-command;
-install_utility post-attach-command-entrypoint;
-
-install_utility checkout-same-branch;
-install_utility pull-repositories;
-install_utility push-repositories;
-install_utility generate-scripts;
-install_utility get-cmake-build-dir;
-install_utility make-conda-dependencies;
-install_utility make-conda-env;
-install_utility make-pip-dependencies;
-install_utility make-pip-env;
-install_utility make-vscode-workspace;
-install_utility parse-cmake-args;
-install_utility parse-cmake-build-type;
-install_utility parse-cmake-define;
-install_utility parse-pip-install-args;
-install_utility parse-pip-wheel-args;
-install_utility python-pkg-roots;
-install_utility python-pkg-names;
-install_utility python-conda-pkg-names;
-install_utility get-num-archs-jobs-and-load;
-install_utility list-repos;
-install_utility query-manifest;
+declare -a commands=(
+    checkout-same-branch
+    generate-docstring
+    generate-scripts
+    get-cmake-build-dir
+    get-num-archs-jobs-and-load
+    list-repos
+    make-conda-dependencies
+    make-conda-env
+    make-pip-dependencies
+    make-pip-env
+    make-vscode-workspace
+    post-attach-command
+    post-attach-command-entrypoint
+    post-start-command
+    pull-repositories
+    push-repositories
+    python-conda-pkg-names
+    python-pkg-names
+    python-pkg-roots
+    query-manifest
+    select-cmake-args
+    select-cmake-build-args
+    select-cmake-build-type
+    select-cmake-define
+    select-cmake-install-args
+    select-cmd-args
+    select-pip-install-args
+    select-pip-wheel-args
+    update-content-command
+);
+
+# Install alternatives
+for cmd in "${commands[@]}"; do
+    update-alternatives --install /usr/bin/rapids-${cmd} rapids-${cmd} /opt/rapids-build-utils/bin/${cmd}.sh 0;
+done
+
+# Install bash_completion script
+if type devcontainer-utils-generate-bash-completion >/dev/null 2>&1; then
+    devcontainer-utils-generate-bash-completion                          \
+        --out-file /etc/bash_completion.d/rapids-build-utils-completions \
+        ${commands[@]/#/--command }                                      \
+    ;
+fi
 
 find /opt/rapids-build-utils \
     \( -type d -exec chmod 0775 {} \; \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 33026e7dc..24f3dfb40 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -8,21 +8,20 @@
 # then checks out all repositories to this common branch.
 #
 # Boolean options:
-#  -h,--help          print this text
+#  -h,--help          Print this text.
 #
 # Options that require values:
-#  -j,--parallel <num>   Fetch <num> repos in parallel
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
-#                        (default: none)
-#  -r,--repo <repo>      Filter the results to include <repo> entries.
-#                        (default: all repositories)
+#  -j,--parallel <num>   Fetch <num> repos in parallel.
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 checkout_same_branch() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args "$@" <&0)";
 
     eval "$(                                        \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}      \
@@ -139,4 +138,4 @@ checkout_same_branch() {
     done;
 }
 
-checkout_same_branch "$@";
+checkout_same_branch "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-docstring.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-docstring.sh
new file mode 100755
index 000000000..86d76348a
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-docstring.sh
@@ -0,0 +1,178 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  . rapids-generate-docstring
+#
+# Parses the docstring of the source script and evaluates
+# its @_include_<X> statements to the functions in this file.
+#
+# The evaluated docstring is cached in `/tmp/rapids-build-utils/.docstrings-cache/`.
+
+if ((${#BASH_SOURCE[@]})) && [ "${BASH_SOURCE[0]}" != "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}" ]; then
+
+    # shellcheck disable=SC1091
+    source devcontainer-utils-parse-args;
+
+    __cmd="${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}";
+
+    _include_usage() {
+        local -;
+        set -euo pipefail;
+        _print_usage "$@" | sed -rn "0,/^(\
+[ ]{1,4}-\
+|Options:\
+|Boolean options:\
+|Options that require values:\
+|Positional arguments\
+|CMake Options:\
+|CMake Build Options:\
+|CMake Install Options:\
+|General Options\
+|Install Options\
+|Wheel Options\
+|Package Index Options\
+)/I{x;p}";
+    }
+
+    _include_options() {
+        local expr="/^([ ]{1,4}-\
+|Options:\
+|Boolean options:\
+|Options that require values:\
+|CMake Options:\
+|CMake Build Options:\
+|CMake Install Options:\
+|General Options\
+|Install Options\
+|Wheel Options\
+|Package Index Options\
+)/,/^$/p"
+        if test $# -gt 0; then
+            devcontainer_utils_debug="" rapids_build_utils_debug="" \
+            "$@" 2>&1 | sed -rn "${expr}";
+        else
+            devcontainer_utils_debug="" rapids_build_utils_debug="" \
+            ${__cmd} -h 2>&1 | sed -rn "${expr}";
+        fi
+    }
+
+    _include_bool_options() {
+        if test $# -gt 0; then
+            devcontainer_utils_debug="" rapids_build_utils_debug="" \
+            "$@" 2>&1 | sed -n '/^Boolean options:$/,/^$/p';
+        else
+            devcontainer_utils_debug="" rapids_build_utils_debug="" \
+            ${__cmd} -h 2>&1 | sed -n '/^Boolean options:$/,/^$/p';
+        fi
+    }
+
+    _include_value_options() {
+        if test $# -gt 0; then
+            devcontainer_utils_debug="" rapids_build_utils_debug="" \
+            "$@" 2>&1 | sed -n '/^Options that require values:$/,/^$/p';
+        else
+            devcontainer_utils_debug="" rapids_build_utils_debug="" \
+            ${__cmd} -h 2>&1 | sed -n '/^Options that require values:$/,/^$/p';
+        fi
+    }
+
+    _include_cmake_options() {
+        _include_options rapids-select-cmake-args -h;
+    }
+
+    _include_cmake_build_options() {
+        _include_options rapids-select-cmake-build-args -h;
+    }
+
+    _include_cmake_install_options() {
+        _include_options rapids-select-cmake-install-args -h;
+    }
+
+    _include_pip_general_options() {
+        local doc="/tmp/rapids-build-utils/.docstrings-cache/pip.txt";
+        if ! test -f "${doc}"; then
+            pip --help > "${doc}" 2>&1;
+        fi
+        sed -n '/^General Options/,/^$/p' "${doc}";
+    }
+
+    _include_pip_package_index_options() {
+        local doc="/tmp/rapids-build-utils/.docstrings-cache/pip-install.txt";
+        if ! test -f "${doc}"; then
+            pip install --help > "${doc}" 2>&1;
+        fi
+        sed -n '/^Package Index Options/,/^$/p' "${doc}";
+    }
+
+    _include_pip_install_options() {
+        local doc="/tmp/rapids-build-utils/.docstrings-cache/pip-install.txt";
+        if ! test -f "${doc}"; then
+            pip install --help > "${doc}" 2>&1;
+        fi
+        sed -n '/^Install Options/,/^$/p' "${doc}";
+    }
+
+    _include_pip_wheel_options() {
+        local doc="/tmp/rapids-build-utils/.docstrings-cache/pip-wheel.txt";
+        if ! test -f "${doc}"; then
+            pip wheel --help > "${doc}" 2>&1;
+        fi
+        sed -n '/^Wheel Options/,/^$/p' "${doc}";
+    }
+
+    _generate_docstring() {
+        local -;
+        set -euo pipefail;
+
+        # shellcheck disable=SC1091
+        . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-docstring';
+
+        local cmd="${1:?missing required positional argument CMD}"; shift;
+        local out="${1:?missing required positional argument OUT}"; shift;
+
+        # rm -f "${out}";
+
+        if test -f "${out}"; then return; fi
+
+        mkdir -p "$(dirname "${out}")";
+
+        local re="^@(\
+echo|\
+_include_usage|\
+_include_options|\
+_include_bool_options|\
+_include_value_options|\
+_include_cmake_options|\
+_include_cmake_build_options|\
+_include_cmake_install_options|\
+_include_pip_general_options|\
+_include_pip_package_index_options|\
+_include_pip_install_options|\
+_include_pip_wheel_options\
+).*?$";
+        while IFS= read -er line; do
+            if [[ "${line}" =~ ${re} ]]; then
+                eval "${line:1}";
+            else
+                echo "${line}";
+            fi
+        done < <(_print_usage "${cmd}") | sed 's/^/# /' > "${out}";
+    }
+
+    _filter_args() {
+        local -;
+        set -euo pipefail;
+        eval "$(_parse_args "$@" <&0)";
+        echo "${ARGS[*]}";
+    }
+
+    _parse_args() {
+        # shellcheck disable=SC1091
+        . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'parse-args';
+        _parse_args_for_file "${__doc}" "$@" <&0;
+    }
+
+    __doc="/tmp/rapids-build-utils/.docstrings-cache/${__cmd//\//-}.txt";
+
+    _generate_docstring "${__cmd}" "${__doc}";
+fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index e84201eaa..79da95069 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -5,57 +5,32 @@
 ALT_SCRIPT_DIR="${ALT_SCRIPT_DIR:-/usr/bin}";
 TEMPLATES="${TEMPLATES:-/opt/rapids-build-utils/bin/tmpl}";
 TMP_SCRIPT_DIR="${TMP_SCRIPT_DIR:-/tmp/rapids-build-utils}";
+COMPLETION_TMPL="${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}";
+COMPLETION_FILE="${COMPLETION_FILE:-${HOME}/.bash_completion.d/rapids-build-utils-completions}";
 
-clean_completions() {
+generate_completions() {
     local -;
     set -euo pipefail;
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
 
-    mkdir -p "${TMP_SCRIPT_DIR}";
-    mkdir -p "${HOME}/.bash_completion.d";
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
 
-    local -r completions_file="${HOME}/.bash_completion.d/rapids-build-utils-utils-completions";
-
-    if test -f "${completions_file}"; then
-        local cmd; for cmd in "${commands[@]}"; do
-            complete -r "${cmd}" 2>/dev/null || true;
-            sed -i "/complete -F _devcontainer_utils_completions ${cmd};.*/d" "${completions_file}";
-        done
-    fi
+    devcontainer-utils-generate-bash-completion          \
+        --out-file "$(realpath -m "${COMPLETION_FILE}")" \
+        --template "$(realpath -m "${COMPLETION_TMPL}")" \
+        ${commands[@]/#/--command }                      \
+    ;
 }
 
-generate_completions() {
+clean_scripts_and_aliases() {
     local -;
     set -euo pipefail;
 
-    mkdir -p "${HOME}/.bash_completion.d";
-    readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
-
-    local -r completions_file="${HOME}/.bash_completion.d/rapids-build-utils-utils-completions";
-    local -r template="${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}";
-
-    if test -f "${template}"; then
-        if ! test -f "${completions_file}"; then
-            cp "${template}" "${completions_file}";
-        fi
-        local cmd; for cmd in "${commands[@]}"; do
-            local str="complete -F _devcontainer_utils_completions ${cmd};";
-            if ! grep -q "${str}" "${completions_file}"; then
-                echo "${str}" >> "${completions_file}";
-            fi
-        done
-    fi
-}
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
 
-clean_scripts() {
-    local -;
-    set -euo pipefail;
-    mkdir -p "${TMP_SCRIPT_DIR}";
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
     sudo rm -f -- \
         "${commands[@]/#/${ALT_SCRIPT_DIR}\/}" \
@@ -67,24 +42,7 @@ generate_script() {
     if test -n "${bin}"; then
         (
             cat - \
-          | envsubst '$HOME
-                      $NAME
-                      $SRC_PATH
-                      $PY_ENV
-                      $PY_SRC
-                      $PY_LIB
-                      $BIN_DIR
-                      $CPP_LIB
-                      $CPP_SRC
-                      $CPP_ARGS
-                      $CPP_DEPS
-                      $GIT_TAG
-                      $GIT_REPO
-                      $GIT_HOST
-                      $GIT_UPSTREAM
-                      $PY_CMAKE_ARGS
-                      $PIP_WHEEL_ARGS
-                      $PIP_INSTALL_ARGS' \
+          | envsubst '$HOME $NAME $SRC_PATH $PY_ENV $PY_SRC $PY_LIB $BIN_DIR $CPP_LIB $CPP_SRC $CPP_ARGS $CPP_DEPS $GIT_TAG $GIT_REPO $GIT_HOST $GIT_UPSTREAM $PY_CMAKE_ARGS $PIP_WHEEL_ARGS $PIP_INSTALL_ARGS' \
           | tee "${TMP_SCRIPT_DIR}/${bin}" >/dev/null;
 
             chmod +x "${TMP_SCRIPT_DIR}/${bin}";
@@ -105,8 +63,7 @@ generate_all_script_impl() {
     if test -n "${bin}" && ! test -f "${TMP_SCRIPT_DIR}/${bin}"; then
         (
             cat - \
-          | envsubst '$NAMES
-                      $SCRIPT' \
+          | envsubst '$NAME $NAMES $SCRIPT' \
           | tee "${TMP_SCRIPT_DIR}/${bin}" >/dev/null;
 
             chmod +x "${TMP_SCRIPT_DIR}/${bin}";
@@ -262,6 +219,7 @@ generate_scripts() {
             done
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
+                NAME="${repo_name:-}"        \
                 SRC_PATH=~/"${!repo_path:-}" \
                 BIN_DIR="${bin_dir}"         \
                 CPP_LIB="${cpp_name:-}"      \
@@ -302,6 +260,7 @@ generate_scripts() {
             py_libs+=("${!py_name}");
 
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
+                NAME="${repo_name:-}"                     \
                 BIN_DIR="${bin_dir}"                      \
                 SRC_PATH=~/"${!repo_path:-}"              \
                 PY_SRC="${py_path}"                       \
@@ -317,10 +276,10 @@ generate_scripts() {
         done;
 
         if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-            NAME="${repo_name:-}"    \
-            PY_LIB="${py_libs[*]}"   \
-            CPP_LIB="${cpp_libs[*]}" \
-            generate_repo_scripts    ;
+            NAME="${repo_name:-}"      \
+            PY_LIB="${py_libs[*]@Q}"   \
+            CPP_LIB="${cpp_libs[*]@Q}" \
+            generate_repo_scripts      ;
         fi
 
         # Generate a clone script for each repo
@@ -337,27 +296,44 @@ generate_scripts() {
         generate_clone_script             ;
     done
 
-    sudo find /opt/rapids-build-utils \
-        \( -type d -exec chmod 0775 {} \; \
-        -o -type f -exec chmod 0755 {} \; \);
-
     unset cpp_name_to_path;
 
-    for script in "clone" "clean" "configure" "build" "cpack" "install" "uninstall"; do
-        # Generate a script to run a script for all repos
-        NAMES="${repo_names[*]}" \
-        SCRIPT="${script}"       \
-        generate_all_script      ;
-    done;
+    if ((${#repo_names[@]} > 0)); then
+        for script in "clone" "clean" "configure" "build" "cpack" "install" "uninstall"; do
+            # Generate a script to run a script for all repos
+            NAME="${repo_names[0]}"    \
+            NAMES="${repo_names[*]@Q}" \
+            SCRIPT="${script}"         \
+            generate_all_script        ;
+        done;
+    fi
 }
 
-clean_completions;
-clean_scripts;
+_generate() {
+    local -;
+    set -euo pipefail;
+
+    echo "Generating RAPIDS build scripts in ${ALT_SCRIPT_DIR}";
+
+    mkdir -p "${TMP_SCRIPT_DIR}";
 
-for pid in $(generate_scripts "$@"); do
-    while [[ -e "/proc/$pid" ]]; do
-        sleep 0.1
+    # Clean the cached parsed docstrings
+    rm -rf /tmp/rapids-build-utils/.docstrings-cache/;
+    # Bash completions
+    rm -f "$(realpath -m "${COMPLETION_FILE}")";
+    # Clean existing scripts and aliases
+    clean_scripts_and_aliases;
+
+    # Generate new scripts
+    local pid;
+    for pid in $(generate_scripts "$@"); do
+        while test -e "/proc/${pid}"; do
+            sleep 0.1;
+        done
     done
-done
 
-generate_completions;
+    # Generate new bash completions
+    generate_completions;
+}
+
+_generate "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
index 961b0a7d8..dea34b325 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -30,7 +30,7 @@ get_cmake_build_dir() {
     if test $# -gt 0; then shift; fi;
 
     local bin="build";
-    local -r type="$(rapids-parse-cmake-build-type "$@" <&0 | tr '[:upper:]' '[:lower:]')";
+    local -r type="$(rapids-select-cmake-build-type "$@" <&0 | tr '[:upper:]' '[:lower:]')";
     local -r cuda="$(grep -o '^[0-9]*.[0-9]*' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
 
     bin+="${PYTHON_PACKAGE_MANAGER:+/${PYTHON_PACKAGE_MANAGER}}${cuda:+/cuda-${cuda}}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 20d6cedd8..d5490a2ec 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -10,7 +10,7 @@
 # note: This wouldn't be necessary if `nvcc` interacted with the POSIX jobserver.
 #
 # Boolean options:
-#  -h,--help                    print this text
+#  -h,--help                              Print this text.
 #
 # Options that require values:
 #  -a,--archs <num>                       Build <num> CUDA archs in parallel
@@ -25,12 +25,15 @@
 #                                         Higher values yield fewer parallel CUDA device object compilations.
 #                                         (default: 1)
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 get_num_archs_jobs_and_load() {
     local -;
     set -euo pipefail
 
+    eval "$(_parse_args "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'get-num-archs-jobs-and-load';
 
@@ -46,7 +49,7 @@ get_num_archs_jobs_and_load() {
 
     if test -z "${archs:-}" \
     && test -n "${INFER_NUM_DEVICE_ARCHITECTURES:-}"; then
-        archs="$(rapids-parse-cmake-define CMAKE_CUDA_ARCHITECTURES "${OPTS[@]}" || echo)";
+        archs="$(rapids-select-cmake-define CMAKE_CUDA_ARCHITECTURES "${OPTS[@]}" || echo)";
         archs="${archs:-${CMAKE_CUDA_ARCHITECTURES:-${CUDAARCHS:-}}}";
 
         case "${archs:-}" in
@@ -90,9 +93,9 @@ ____EOF
     n_jobs=$((n_jobs < 1 ? 1 : n_jobs));
     n_jobs=$((n_arch > 1 ? n_jobs : n_load));
 
-    echo "declare n_arch; n_arch=${n_arch}";
-    echo "declare n_jobs; n_jobs=${n_jobs}";
-    echo "declare n_load; n_load=${n_load}";
+    echo "declare n_arch=${n_arch}";
+    echo "declare n_jobs=${n_jobs}";
+    echo "declare n_load=${n_load}";
 }
 
-get_num_archs_jobs_and_load "$@";
+get_num_archs_jobs_and_load "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
index 3a2aaf4d3..74e602640 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/list-repos.sh
@@ -6,24 +6,24 @@
 # Query the `manifest.yaml` in a shell-friendly format, optionally filtering results by repository name.
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
+# @_include_value_options rapids-query-manifest -h | tail -n+2 | head -n-1;
 #  -o,--omit <repo>      Filter the results to exclude <repo> entries.
 #                        (default: none)
 #  -r,--repo <repo>      Filter the results to include <repo> entries.
 #                        (default: all repositories)
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 list_repos() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --skip '-m,--manifest' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -m,--manifest
-    ' - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'list-repos';
 
@@ -53,4 +53,4 @@ list_repos() {
     rapids-query-manifest "${OPTS[@]}" -- "${query}";
 }
 
-list_repos "$@";
+list_repos "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 695e23f51..9d037cf1b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -6,17 +6,17 @@
 # Generate a combined conda environment YAML file for all repos.
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
 #  -k,--key <key>        Only include the key(s)
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Omit dependencies for repo(s).
-#                        (default: none)
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-3;
 #  --repo <repo>         Only include dependencies for repo(s).
 #                        (default: all repositories)
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 generate_env_yaml() {
     (
         (rapids-dependency-file-generator "${@:2}" 2>/dev/null || echo "name: none") \
@@ -29,12 +29,10 @@ make_conda_dependencies() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --skip '-m,--manifest -o,--omit --repo' "$@" <&0)";
+
+    eval "$(rapids-list-repos "${OPTS[@]}")";
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -m,--manifest
-        -o,--omit
-        --repo
-    ' - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-conda-env make-conda-dependencies';
 
@@ -48,8 +46,6 @@ make_conda_dependencies() {
 
     local conda_env_yamls=();
 
-    eval "$(rapids-list-repos "${OPTS[@]}")";
-
     local i;
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
@@ -106,4 +102,4 @@ make_conda_dependencies() {
     fi
 }
 
-make_conda_dependencies "$@";
+make_conda_dependencies "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 13c1c96b4..14d6e61e0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -6,22 +6,19 @@
 # Make a combined conda environment for all repos.
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #  -f,--force            Delete the existing conda env and recreate it from scratch.
 #
-# Options that require values:
-#  -k,--key <key>        Only include the key(s)
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Omit dependencies for repo(s).
-#                        (default: none)
-#  --repo <repo>         Only include dependencies for repo(s).
-#                        (default: all repositories)
+# @_include_value_options rapids-make-conda-dependencies -h
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 make_conda_env() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --skip '-k,--key -m,--manifest -o,--omit --repo' "${@:2}" <&0)";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-conda-env';
@@ -29,13 +26,6 @@ make_conda_env() {
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.yml";
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -k,--key
-        -m,--manifest
-        -o,--omit
-        --repo
-    ' - <<< "${@@Q}")";
-
     # Remove the current conda env if called with `-f|--force`
     if test -n "${f:-${force:-}}"; then
         rm -rf "${HOME}/.conda/envs/${env_name}" \
@@ -84,7 +74,7 @@ make_conda_env() {
 # shellcheck disable=SC1091
 . /opt/conda/etc/profile.d/mamba.sh;
 
-make_conda_env "${DEFAULT_CONDA_ENV:-rapids}" "$@";
+make_conda_env "${DEFAULT_CONDA_ENV:-rapids}" "$@" <&0;
 
 # shellcheck disable=SC1090
 . /etc/profile.d/*-mambaforge.sh;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index 778df57b5..d664a123f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -6,19 +6,19 @@
 # Generate a combined pip requirements file for all repos.
 #
 # Boolean options:
-#  -h,--help               print this text
-#  --no-dedupe             don't sort and dedupe the combined requirements.txt
+#  -h,--help               Print this text.
+#  --no-dedupe             Don't sort and dedupe the combined requirements.txt.
 #
 # Options that require values:
 #  -k,--key <key>          Only include the key(s)
-#  -m,--manifest <file>    Use a specific manifest.json
-#                          (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>        Omit dependencies for repo(s).
-#                          (default: none)
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-3;
 #  --repo <repo>           Only include dependencies for repo(s).
 #                          (default: all repositories)
 #  -r,--requirement <file> Path(s) to additional requirement files to include.
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 generate_requirements() {
     (
         (rapids-dependency-file-generator "${@:2}" 2>/dev/null || echo "") \
@@ -31,12 +31,8 @@ make_pip_dependencies() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --skip '-m,--manifest -o,--omit --repo' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -m,--manifest
-        -o,--omit
-        --repo
-    ' - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-pip-env make-pip-dependencies';
 
@@ -124,4 +120,4 @@ make_pip_dependencies() {
     fi
 }
 
-make_pip_dependencies "$@";
+make_pip_dependencies "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index e4bb59830..629a4fed4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -6,39 +6,34 @@
 # Make a combined pip virtual environment for all repos.
 #
 # Boolean options:
-#  -h,--help               print this text
+#  -h,--help               Print this text.
 #  -f,--force              Delete the existing pip venv and recreate it from scratch.
-#  --no-dedupe             don't sort and dedupe the combined requirements.txt
+# @_include_bool_options rapids-make-pip-dependencies -h | tail -n+2 | head -n-3;
 #
-# Options that require values:
-#  -k,--key <key>          Only include the key(s)
-#  -m,--manifest <file>    Use a specific manifest.json
-#                          (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>        Omit dependencies for repo(s).
-#                          (default: none)
-#  --repo <repo>           Only include dependencies for repo(s).
-#                          (default: all repositories)
-#  -r,--requirement <file> Path(s) to additional requirement files to include.
+# @_include_value_options rapids-make-pip-dependencies -h;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 make_pip_env() {
     local -;
     set -euo pipefail;
 
-    local env_name="${1}"; shift;
-    local env_file_name="${env_name}.requirements.txt";
-
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
+    eval "$(_parse_args --skip '
         --no-dedupe
         -k,--key
         -m,--manifest
         -o,--omit
         --repo
         -r,--requirement
-    ' - <<< "${@@Q}")";
+    ' "${@:2}" <&0)";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-pip-env';
 
+    local env_name="${1}"; shift;
+    local env_file_name="${env_name}.requirements.txt";
+
     # Remove the current virtual env if called with `-f|--force`
     if test -n "${force:-}"; then
         rm -rf "${HOME}/.local/share/venvs/${env_name}" \
@@ -88,7 +83,7 @@ make_pip_env() {
     fi
 }
 
-make_pip_env "${DEFAULT_VIRTUAL_ENV:-rapids}" "$@";
+make_pip_env "${DEFAULT_VIRTUAL_ENV:-rapids}" "$@" <&0;
 
 if test -f "${HOME}/.local/share/venvs/${DEFAULT_VIRTUAL_ENV:-rapids}/bin/activate"; then
     # shellcheck disable=SC1090
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
index 441462e2f..370220c74 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
@@ -44,7 +44,7 @@ cpp_lib_dirs() {
 
         local j=0;
         for ((j=0; j < ${!cpp_length:-0}; j+=1)); do
-            local cpp_name="${repo}_cpp_${j}_name";
+            # local cpp_name="${repo}_cpp_${j}_name";
             local cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
             echo ~/"${!repo_path:-}/${!cpp_sub_dir:-}";
         done
@@ -95,7 +95,7 @@ EOF
 }
 
 if echo "$@" | grep -qE '(\-u|\-\-update)'; then
-    (make_vscode_workspace "$@" > /tmp/workspace.code-workspace);
+    make_vscode_workspace "$@" > /tmp/workspace.code-workspace;
     if ! diff -BNqw ~/workspace.code-workspace /tmp/workspace.code-workspace >/dev/null 2>&1; then
         cp /tmp/workspace.code-workspace ~/workspace.code-workspace;
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
deleted file mode 100755
index 4ec6349df..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-build-type.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-rapids-parse-cmake-define CMAKE_BUILD_TYPE "$@" <&0 || echo "Release";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh
deleted file mode 100755
index 53a3c8788..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-install-args.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-# Usage:
-#  rapids-parse-pip-install-args [OPTION]...
-#
-# Filter an arguments list to the subset that `pip install` accepts.
-#
-# -q,--quiet   <value> Give less output. Option is additive, and can be used up to 3 times (corresponding to WARNING, ERROR, and CRITICAL logging levels).
-# -v,--verbose <value> Give more output. Option is additive, and can be used up to 3 times.
-# Install Options:
-
-if ! test -f /tmp/pip-install-help.txt; then
-    pip install --help >/tmp/pip-install-help.txt 2>&1;
-fi
-
-# shellcheck disable=SC1091
-. devcontainer-utils-parse-args-from-docstring;
-
-parse_pip_install_args() {
-    local -;
-    set -euo pipefail;
-
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-pip-install-args"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
-    eval "$(devcontainer-utils-parse-args <(
-        cat <(print_usage rapids-parse-pip-install-args) \
-            <(sed -n '0,/Install Options:/!p' /tmp/pip-install-help.txt) \
-      | sed 's/^/# /'
-    ) "$@" <&0)";
-
-    echo "${ARGS[*]}";
-}
-
-parse_pip_install_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh
deleted file mode 100755
index de83cf600..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-pip-wheel-args.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-# Usage:
-#  rapids-parse-pip-wheel-args [OPTION]...
-#
-# Filter an arguments list to the subset that `pip wheel` accepts.
-#
-# -q,--quiet   <value> Give less output. Option is additive, and can be used up to 3 times (corresponding to WARNING, ERROR, and CRITICAL logging levels).
-# -v,--verbose <value> Give more output. Option is additive, and can be used up to 3 times.
-# Wheel Options:
-
-if ! test -f /tmp/pip-wheel-help.txt; then
-    pip wheel --help >/tmp/pip-wheel-help.txt 2>&1;
-fi
-
-# shellcheck disable=SC1091
-. devcontainer-utils-parse-args-from-docstring;
-
-parse_pip_wheel_args() {
-    local -;
-    set -euo pipefail;
-
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-pip-wheel-args"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
-    eval "$(devcontainer-utils-parse-args <(
-        cat <(print_usage rapids-parse-pip-wheel-args) \
-            <(sed -n '0,/Wheel Options:/!p' /tmp/pip-wheel-help.txt) \
-      | sed 's/^/# /'
-    ) "$@" <&0)";
-
-    echo "${ARGS[*]}";
-}
-
-parse_pip_wheel_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
deleted file mode 100755
index 6cf9445da..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-valid-args.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-parse_valid_args() {
-    local -;
-    set -euo pipefail;
-
-    local -r cmd="$*";
-    local -r hash="$(echo "$cmd" | tr -d'[:space:]')";
-    local -r file="${TMPDIR:-/tmp}/${hash}-args.log";
-
-    if [[ ! -f "${file}" ]]; then
-        $cmd --help                             \
-      | grep -oE '^  -(-|\w+|\d+|, --|, |,|=)+' \
-      | tr -d '  ' | tr ',' '\n'                \
-      | sed -r '/^\s*$/d'                       \
-      > "${file}";
-    fi
-
-    cat "${file}";
-}
-
-parse_valid_args "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index 0348d8f93..a45be3273 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -6,21 +6,19 @@
 # Pull the latest commits from each repository's upstream remote.
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
-#                        (default: none)
-#  -r,--repo <repo>      Filter the results to only include <repo> entries.
-#                        (default: all repositories)
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 pull_repositories() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     eval "$(rapids-list-repos "$@")";
 
@@ -66,4 +64,4 @@ Please enter a branch name to pull (or leave empty to skip): " branch_name </dev
     done
 }
 
-pull_repositories "$@";
+pull_repositories "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
index deeef8b9f..df27793d8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/push-repositories.sh
@@ -6,21 +6,19 @@
 # Push the latest commits from each repository to the origin remote.
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
-#                        (default: none)
-#  -r,--repo <repo>      Filter the results to only include <repo> entries.
-#                        (default: all repositories)
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 push_repositories() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     eval "$(rapids-list-repos "$@")";
 
@@ -43,4 +41,4 @@ push_repositories() {
     done;
 }
 
-push_repositories "$@";
+push_repositories "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
index 1fd15678f..e0c8d55d5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-conda-pkg-names.sh
@@ -9,21 +9,19 @@
 # conda env.
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
-#                        (default: none)
-#  -r,--repo <repo>      Filter the results to only include <repo> entries.
-#                        (default: all repositories)
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 python_conda_pkg_names() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     eval "$(rapids-list-repos "$@")";
 
@@ -53,4 +51,4 @@ python_conda_pkg_names() {
     done
 }
 
-python_conda_pkg_names "$@";
+python_conda_pkg_names "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
index 4f84414a6..db98824ba 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-names.sh
@@ -6,21 +6,19 @@
 # List python package names as determined by manifest.yaml
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
-#                        (default: none)
-#  -r,--repo <repo>      Filter the results to only include <repo> entries.
-#                        (default: all repositories)
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 python_pkg_names() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     eval "$(rapids-list-repos "$@")";
 
@@ -45,4 +43,4 @@ python_pkg_names() {
     done
 }
 
-python_pkg_names "$@";
+python_pkg_names "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
index 7a9ebae46..194218775 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-pkg-roots.sh
@@ -6,21 +6,19 @@
 # List python package source dirs as determined by manifest.yaml
 #
 # Boolean options:
-#  -h,--help             print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
-#  -m,--manifest <file>  Use a specific manifest.json
-#                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
-#  -o,--omit <repo>      Filter the results to exclude <repo> entries.
-#                        (default: none)
-#  -r,--repo <repo>      Filter the results to only include <repo> entries.
-#                        (default: all repositories)
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 python_pkg_roots() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     eval "$(rapids-list-repos "$@")";
 
@@ -45,4 +43,4 @@ python_pkg_roots() {
     done
 }
 
-python_pkg_roots "$@";
+python_pkg_roots "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index 3fcae5487..04e66ec77 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -6,18 +6,21 @@
 # Query the `manifest.yaml` in a shell-friendly format.
 #
 # Boolean options:
-#  -h,--help          print this text
+#  -h,--help             Print this text.
 #
 # Options that require values:
-#  -m,--manifest <file>  Use a specific manifest.json
+#  -m,--manifest <file>  Use a specific manifest.json.
 #                        (default: ${PROJECT_MANIFEST_YML:-"/opt/rapids-build-utils/manifest.yaml"})
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 query_manifest() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'query-manifest';
 
@@ -51,4 +54,4 @@ ________EOF
     yq -Mo json "${manifest}" | jq -r "${query}";
 }
 
-query_manifest "$@";
+query_manifest "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-args.sh
similarity index 51%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-args.sh
index cb8669a8d..317f25137 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-args.sh
@@ -1,32 +1,15 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  rapids-parse-cmake-args [OPTION]...
+#  rapids-select-cmake-args [OPTION]...
 #
-# Filter an arguments list to the subset that CMake accepts.
+# Filter an arguments list to the subset that we pass to CMake.
 #
-# Boolean options:
-#  -h,--help                      Print usage information and exit.
-#  -H,--help                      Print usage information and exit.
-#  --debug-trycompile             Do not delete the try_compile build tree. Only useful on one try_compile at a time.
-#  --debug-output                 Put cmake in a debug mode.
-#  --debug-find                   Put cmake find in a debug mode.
-#  --fresh                        Configure a fresh build tree, removing any existing cache file.
-#  --find-package                 Legacy pkg-config like mode.  Do not use.
-#  --log-context                  Prepend log messages with context, if given
-#  --trace                        Put cmake in trace mode.
-#  --trace-expand                 Put cmake in trace mode with variable expansion.
-#  --warn-uninitialized           Warn about uninitialized values.
-#  --no-warn-unused-cli           Don't warn about command line options.
-#  --check-system-vars            Find problems with variable usage in system files.
-#  --compile-no-warning-as-error  Ignore COMPILE_WARNING_AS_ERROR property and CMAKE_COMPILE_WARNING_AS_ERROR variable.
-#
-# Options that require values:
+# CMake Options:
+#  -h,--help                       Print usage information and exit.
 #  -S <path>                       Explicitly specify a source directory.
 #  -B <path>                       Explicitly specify a build directory.
-#  -C <path>                       Pre-load a script to populate the cache.
 #  -D <var>[:<type>]=<value>       Create or update a cmake cache entry.
-#  -U <globbing_expr>              Remove matching entries from CMake cache.
 #  -G <generator-name>             Specify a build system generator.
 #  -T <toolset-name>               Specify toolset name if supported by generator.
 #  -A <platform-name>              Specify platform name if supported by generator.
@@ -41,35 +24,31 @@
 #  -W (error=deprecated)           Make deprecated macro and function warnings errors.
 #  -W (no-error=deprecated)        Make deprecated macro and function warnings not errors.
 #  --preset <preset>               Specify a configure preset.
+#  --fresh                         Configure a fresh build tree, removing any existing cache file.
 #  --graphviz <file>               Generate graphviz of dependencies, see CMakeGraphVizOptions.cmake for more.
 #  --log-level,--loglevel (ERROR|WARNING|NOTICE|STATUS|VERBOSE|DEBUG|TRACE)
-#                                  Set the verbosity of messages from CMake files. --loglevel is also accepted for backward compatibility reasons.
+#                                  Set the verbosity of messages from CMake files.
+#                                  --loglevel is also accepted for backward compatibility reasons.
+#  --log-context                   Prepend log messages with context, if given
+#  --debug-trycompile              Do not delete the try_compile build tree. Only useful on one try_compile at a time.
+#  --debug-output                  Put cmake in a debug mode.
+#  --debug-find                    Put cmake find in a debug mode.
 #  --debug-find-pkg <pkg-name>     Limit cmake debug-find to the comma-separated list of packages
 #  --debug-find-var <var-name>     Limit cmake debug-find to the comma-separated list of result variables
+#  --trace                         Put cmake in trace mode.
+#  --trace-expand                  Put cmake in trace mode with variable expansion.
 #  --trace-format (human|json-v1)  Set the output format of the trace.
 #  --trace-source <file>           Trace only this CMake file/module.  Multiple options allowed.
 #  --trace-redirect <file>         Redirect trace output to a file instead of stderr.
+#  --warn-uninitialized            Warn about uninitialized values.
+#  --no-warn-unused-cli            Don't warn about command line options.
+#  --check-system-vars             Find problems with variable usage in system files.
+#  --compile-no-warning-as-error   Ignore COMPILE_WARNING_AS_ERROR property and CMAKE_COMPILE_WARNING_AS_ERROR variable.
+#
 #  --profiling-format <fmt>        Output data for profiling CMake scripts. Supported formats: google-trace
 #  --profiling-output <file>       Select an output path for the profiling data enabled through --profiling-format.
 
 # shellcheck disable=SC1091
-. devcontainer-utils-parse-args-from-docstring;
-
-parse_cmake_args() {
-    local -;
-    set -euo pipefail;
-
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-cmake-args"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
-    eval "$(devcontainer-utils-parse-args rapids-parse-cmake-args "$@" <&0)";
-
-    echo "${ARGS[*]}";
-}
+. rapids-generate-docstring;
 
-parse_cmake_args "$@" <&0;
+_filter_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-args.sh
new file mode 100755
index 000000000..0d8636806
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-args.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-select-cmake-build-args [OPTION]...
+#
+# Filter an arguments list to the subset accepted by `cmake --build`.
+#
+# CMake Build Options:
+# Boolean options:
+#  --clean-first                               Build target 'clean' first, then build. (To clean only, use --target 'clean'.)
+#  -v,--verbose                                Enable verbose output - if supported - including the build commands to be executed.
+#
+# Options that require values:
+#  --preset <preset>                           Specify a build preset.
+#  -j,--parallel <num>                         Build in parallel using the given number of jobs.
+#                                              If <num> is omitted the native build tool's default number is used.
+#                                              The CMAKE_BUILD_PARALLEL_LEVEL environment variable specifies a default parallel level when this option is not given.
+#  -t,--target <tgt>                           Build <tgt> instead of default targets.
+#  --config <cfg>                              For multi-configuration tools, choose <cfg>.
+#  --resolve-package-references (on|only|off)  Restore/resolve package references during build.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+_filter_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-type.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-type.sh
new file mode 100755
index 000000000..c48e5dcef
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-build-type.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+rapids-select-cmake-define CMAKE_BUILD_TYPE "$@" <&0 || echo "Release";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-define.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-define.sh
similarity index 66%
rename from features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-define.sh
rename to features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-define.sh
index 59fa61721..5597d4dde 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-define.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-define.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  rapids-parse-cmake-define <name> [cmake_args]...
+#  rapids-select-cmake-define <name> [cmake_args]...
 #
 # Finds the -D<name>=<val> definition from a list of input CMake arguments.
 # If -D<name>=<val> is found in <cmake_args>, <val> is printed to stdout.
@@ -15,20 +15,15 @@ parse_cmake_define() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC2154
-    if test -n "${rapids_build_utils_debug:-}" \
-    && { test -z "${rapids_build_utils_debug##*"*"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-args"*}" \
-          || test -z "${rapids_build_utils_debug##*"parse-cmake-define"*}"; }; then
-        PS4="+ ${BASH_SOURCE[0]}:\${LINENO} "; set -x;
-    fi
-
     local arg;
     local val;
     local def="$1"; shift;
 
     eval "$(devcontainer-utils-parse-args <(echo -e "\n# -D <def>") "$@" <&0)";
 
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'select-cmake-define';
+
     for arg in "${D[@]}"; do
         if test "${def}" = "${arg%=*}"; then
             val="${arg#*=}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh
new file mode 100755
index 000000000..bdd285490
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-select-cmake-install-args [OPTION]...
+#
+# Filter an arguments list to the subset accepted by `cmake --install`.
+#
+# CMake Install Options:
+# Boolean options:
+#  --strip                                       Strip before installing.
+#  -v --verbose                                  Enable verbose output.
+#
+# Options that require values:
+#  --config <cfg>                                For multi-configuration tools, choose <cfg>.
+#  --component <comp>                            Component-based install. Only install <comp>.
+#  --default-directory-permissions <permission>  Default install permission. Use default permission <permission>.
+#  --prefix <prefix>                             The installation prefix CMAKE_INSTALL_PREFIX.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+_filter_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmd-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmd-args.sh
new file mode 100755
index 000000000..d1e066ee4
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmd-args.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-select-cmd-args <CMD> [OPTION]...
+#
+# Filter an arguments list to the subset that <CMD> accepts.
+#
+# Positional arguments:
+# CMD   The command for which to filter arguments.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+_select_args() {
+    local -;
+    set -euo pipefail;
+
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'select-cmd-args';
+
+    local cmd="${1:?missing required positional argument CMD}"; shift;
+
+    eval "$(_parse_args_for_file <(
+        devcontainer_utils_debug="" rapids_build_utils_debug="" \
+        "${cmd}" -h 2>&1 | sed 's/^/# /'
+    ) "$@" <&0)";
+
+    echo "${ARGS[*]}";
+}
+
+if ((${#BASH_SOURCE[@]})) && [ "${BASH_SOURCE[0]}" == "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}" ]; then
+    _select_args "$@" <&0;
+fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-install-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-install-args.sh
new file mode 100755
index 000000000..48df82b3c
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-install-args.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-select-pip-install-args [OPTION]...
+#
+# Filter an arguments list to the subset that `pip install` accepts.
+#
+# @_include_pip_install_options;
+# @_include_pip_package_index_options;
+# @_include_pip_general_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+_filter_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-wheel-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-wheel-args.sh
new file mode 100755
index 000000000..8d47e5a5f
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-pip-wheel-args.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-select-pip-wheel-args [OPTION]...
+#
+# Filter an arguments list to the subset that `pip wheel` accepts.
+#
+# @_include_pip_wheel_options;
+# @_include_pip_package_index_options;
+# @_include_pip_general_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+_filter_args "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
index 3285235c3..3f0dc1350 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.build.tmpl.sh
@@ -3,43 +3,29 @@
 # Usage:
 #  build-all [OPTION]...
 #
-# Runs build-<repo> for each repo in "${NAMES}".
+# Runs build-<repo> for each repo in ${NAMES}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
-#
-# Options that require values:
-#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
-#                                         (default: editable)
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#                                         (default: $(nproc))
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+# @_include_options /usr/bin/build-${NAME} -h | tail -n+2;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 build_all() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all';
 
     for name in ${NAMES}; do
         if type build-${name} >/dev/null 2>&1; then
-            build-${name} "$@";
+            build-${name} "${OPTS[@]}";
         fi
     done
 }
 
-build_all "$@";
+build_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index 774c28e41..3f867cd2a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -3,24 +3,25 @@
 # Usage:
 #  clean-all [OPTION]...
 #
-# Runs clean-<repo> for each repo in "${NAMES}".
+# Runs clean-<repo> for each repo in ${NAMES}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help                    print this text
-#  -v,--verbose                 verbose output
+#  -h,--help            Print this text.
+#  -v,--verbose         verbose output
 #
 # Options that require values:
-#  -j,--parallel <num>          Clone <num> repos in parallel
+#  -j,--parallel <num>  Clean <num> repos in parallel
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 clean_all() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -v,--verbose
-    ' - <<< "${@@Q}")";
+    eval "$(_parse_args --take '-j,--parallel' "$@" <&0)";
 
     eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
 
@@ -36,4 +37,4 @@ clean_all() {
     ";
 }
 
-clean_all "$@";
+clean_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 39cd229f1..b0f09f78e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -3,30 +3,25 @@
 # Usage:
 #  clone-all [OPTION]...
 #
-# Runs clone-<repo> for each repo in "${NAMES}".
+# Runs clone-<repo> for each repo in ${NAMES}.
 #
 # Boolean options:
-#  -h,--help                    print this text
-#  -v,--verbose                 verbose output
-#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
-#                               (default: false)
-#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
-#                               (default: false)
-#  --clone-upstream             always clone the upstream, not the user's fork
+# @_include_bool_options /usr/bin/devcontainer-utils-clone-github-repo -h | tail -n+2 | head -n-1;
+#  --no-update-env              Don't update the Python env with the repo's dependencies after cloning.
 #                               (default: false)
 #
 # Options that require values:
-#  -j,--parallel <num>          Clone <num> repos in parallel
+#  -j,--parallel <num>          Clone <num> repos in parallel.
 #                               (default: 1)
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 clone_all() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        --no-fork
-        --clone-upstream
-    ' - <<< "${@@Q}")";
+    eval "$(_parse_args --take '-j,--parallel --no-update-env' "$@" <&0)";
 
     eval "$(rapids-get-num-archs-jobs-and-load -a3 "$@")";
 
@@ -47,4 +42,4 @@ clone_all() {
     fi
 }
 
-clone_all "$@";
+clone_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
index 9db52cdfc..85798f883 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.configure.tmpl.sh
@@ -3,40 +3,30 @@
 # Usage:
 #  configure-all [OPTION]...
 #
-# Runs configure-<repo> for each repo in "${NAMES}".
+# Runs configure-<repo> for each repo in ${NAMES}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
-#
-# Options that require values:
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h;
+# @_include_cmake_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 configure_all() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all';
 
     for name in ${NAMES}; do
         if type configure-${name} >/dev/null 2>&1; then
-            configure-${name} "$@";
+            configure-${name} "${OPTS[@]}";
         fi
     done
 }
 
-configure_all "$@";
+configure_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index f47c56afd..808868fbd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -3,40 +3,33 @@
 # Usage:
 #  cpack-all [OPTION]...
 #
-# Runs cpack-<repo> for each repo in "${NAMES}".
+# Runs cpack-<repo> for each repo in ${NAMES}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help                                    print this text
-#  -v,--verbose                                 verbose output
-#  --strip                                      Strip before installing.
+#  -h,--help                                     Print this text.
+# @_include_bool_options rapids-select-cmake-install-args -h | tail -n-3 | head -n-1;
 #
 # Options that require values:
-#  -j,--parallel <num>                          CPack <num> repos in parallel
-#                                               (default: 1)
-#  --component <comp>                           Component-based install. Only install component <comp>.
-#                                               (default: all)
-#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
-#                                               (default: none)
-#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
-#  -o,--out-dir <dir>                           copy cpack'd TGZ file into <dir>
-#                                               (default: none)
+#  -j,--parallel <num>                           CPack <num> repos in parallel.
+#                                                (default: 1)
+#  -o,--out-dir <dir>                            Copy cpack'd TGZ file into <dir>.
+#                                                (default: none)
+# @_include_value_options rapids-select-cmake-install-args -h | tail -n-5 | head -n-2;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 cpack_all() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -v,--verbose
-        --component
-        --config
-        --default-directory-permissions
-        -o,--out-dir
-    ' - <<< "${@@Q}")";
+    eval "$(_parse_args --take '-j,--parallel' "$@" <&0)";
 
     j=${j:-1};
-    local -r n_repos=$(wc -w <<< "${NAMES}");
+
+    local -r n_repos=$(echo ${NAMES} | wc -w);
     local k=$((n_repos / j));
 
     eval "$(rapids-get-num-archs-jobs-and-load -j "${j}" -a "${k}" --max-archs "${k}")";
@@ -53,4 +46,4 @@ cpack_all() {
     ";
 }
 
-cpack_all "$@";
+cpack_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
index 742699bc9..4bb38e06f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.install.tmpl.sh
@@ -3,38 +3,29 @@
 # Usage:
 #  install-all [OPTION]...
 #
-# Runs install-<repo> for each repo in "${NAMES}".
+# Runs install-<repo> for each repo in ${NAMES}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
-#  --strip                      Strip before installing.
-#
-# Options that require values:
-#  -p,--prefix <dir>                            Install C++ library into <dir>
-#                                               (default: none)
-#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
-#                                               (default: none)
-#  --component <comp>                           Component-based install. Only install component <comp>.
-#                                               (default: all)
-#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+# @_include_cmake_install_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 install_all() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'install-all';
 
     for name in ${NAMES}; do
         if type install-${name} >/dev/null 2>&1; then
-            install-${name} "$@";
+            install-${name} "${OPTS[@]}";
         fi
     done
 }
 
-install_all "$@";
+install_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
index 941b5853f..a00246a65 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.tmpl.sh
@@ -5,26 +5,29 @@
 #
 # Runs the ${SCRIPT} in each ${NAMES}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
+#  -h,--help     Print this text.
+#  -v,--verbose  Verbose output.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 ${SCRIPT}_all() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' '${SCRIPT}-all';
 
     for name in ${NAMES}; do
         if type ${SCRIPT}-${name} >/dev/null 2>&1; then
-            ${SCRIPT}-${name} "$@";
+            ${SCRIPT}-${name} "${OPTS[@]}";
         fi
     done
 }
 
-${SCRIPT}_all "$@";
+${SCRIPT}_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
index fa398b847..a31d7cde5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.uninstall.tmpl.sh
@@ -3,28 +3,31 @@
 # Usage:
 #  uninstall-all [OPTION]...
 #
-# Runs uninstall-<repo> for each repo in "${NAMES}".
+# Runs uninstall-<repo> for each repo in ${NAMES}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
 # Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
+#  -h,--help     Print this text.
+#  -v,--verbose  Verbose output.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 uninstall_all() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all';
 
     for name in ${NAMES}; do
         if type uninstall-${name} >/dev/null 2>&1; then
-            uninstall-${name} "$@";
+            uninstall-${name} "${OPTS[@]}";
         fi
     done
 }
 
-uninstall_all "$@";
+uninstall_all "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index ad576c258..ded4b00b0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -5,29 +5,23 @@
 #
 # Configure and build ${CPP_LIB}.
 #
-# Boolean options:
-#  -h,--help                    print this text
-#  -v,--verbose                 verbose output
-#
-# Options that require values:
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#                                         (default: $(nproc))
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+# @_include_options /usr/bin/configure-${CPP_LIB}-cpp -h | tail -n+2;
+# @_include_cmake_build_options
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 build_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-j,--parallel' "$@" <&0)";
+
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+    )";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${CPP_LIB}-cpp';
 
@@ -35,23 +29,19 @@ build_${CPP_LIB}_cpp() {
         exit 1;
     fi
 
-    configure-${CPP_LIB}-cpp "$@";
-
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
+    configure-${CPP_LIB}-cpp ${j:+"-j${j}"} "${OPTS[@]}";
 
     # Build C++ lib
     time (
+        local -a cmake_build_args="($(rapids-select-cmake-build-args ${n_jobs:+-j${n_jobs}} "${OPTS[@]}"))";
+
         cmake                               \
         --build "${CPP_SRC}/${BIN_DIR}"     \
-        ${v:+--verbose}                     \
-        -j${n_jobs}                         \
+        "${cmake_build_args[@]}"            \
         --                                  \
-        -l${n_load}                         ;
+        ${n_load:+-l${n_load}}              ;
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} build time:";
     ) 2>&1;
 }
 
-build_${CPP_LIB}_cpp "$@";
+build_${CPP_LIB}_cpp "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index 522b64687..c7ab78c53 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -6,14 +6,17 @@
 # Clean the ${CPP_LIB} build dirs.
 #
 # Boolean options:
-#  -h,--help          print this text
+#  -h,--help  Print this text.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 clean_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME} clean-${CPP_LIB}-cpp';
 
@@ -27,4 +30,4 @@ clean_${CPP_LIB}_cpp() {
         2>/dev/null || true;
 }
 
-clean_${CPP_LIB}_cpp "$@";
+clean_${CPP_LIB}_cpp "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index fa9240aef..e165855b8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -5,28 +5,17 @@
 #
 # Configure ${CPP_LIB}.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
-#
-# Options that require values:
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#                                         (default: $(nproc))
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h;
+# @_include_cmake_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 configure_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         exit 1;
@@ -37,15 +26,21 @@ configure_${CPP_LIB}_cpp() {
         rapids-get-num-archs-jobs-and-load "$@" \
     )";
 
-    local cmake_args=(-GNinja);
-    cmake_args+=(${CMAKE_ARGS:-});
-    cmake_args+=(${CPP_DEPS});
-    cmake_args+=(${CPP_ARGS});
-    cmake_args+=("${v:+--log-level=VERBOSE}");
-    cmake_args+=("${OPTS[@]}");
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all configure-${NAME} configure-${CPP_LIB}-cpp';
 
+    local -a cmake_args_=(
+        -GNinja
+        ${CMAKE_ARGS:-}
+        ${CPP_DEPS}
+        ${CPP_ARGS}
+        ${v:+--log-level=VERBOSE}
+    );
+    local -a cmake_args="(
+        ${cmake_args_+"${cmake_args_[*]@Q}"}
+        $(rapids-select-cmake-args "${ARGS[@]}")
+    )";
+
     local -r bin_dir="$(rapids-get-cmake-build-dir "${CPP_SRC}" "${cmake_args[@]}")";
 
     # Reconfigure if previous configure failed
@@ -72,4 +67,4 @@ configure_${CPP_LIB}_cpp() {
     fi
 }
 
-configure_${CPP_LIB}_cpp "$@";
+configure_${CPP_LIB}_cpp "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 21e7a0cfd..da9f69cc0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -6,40 +6,44 @@
 # CPack ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help                                    print this text
-#  -v,--verbose                                 verbose output
+#  -h,--help                                     Print this text.
+# @_include_bool_options rapids-select-cmake-install-args -h | tail -n-3 | head -n-1;
 #
 # Options that require values:
-#  -j,--parallel <num>                          Use <num> to compress in parallel
-#                                               (default: $(nproc))
-#  --component <comp>                           Component-based install. Only install component <comp>.
-#                                               (default: all)
-#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
-#                                               (default: none)
-#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
-#  -o,--out-dir <dir>                           copy cpack'd TGZ file into <dir>
-#                                               (default: none)
+#  -j,--parallel <num>                           Use <num> threads to compress in parallel
+#                                                (default: $(nproc))
+#  -o,--out-dir <dir>                            copy cpack'd TGZ file into <dir>
+#                                                (default: none)
+# @_include_value_options rapids-select-cmake-install-args -h | tail -n-5 | head -n-2;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 cpack_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -v,--verbose
-        --strip
-        --config
-        --default-directory-permissions
-    ' - <<< "${@@Q}")";
+    eval "$(_parse_args --take '
+        -j,--parallel
+        -o,--out-dir
+        --component
+    ' "$@" <&0)";
 
     if ! test -f "${CPP_SRC}/${BIN_DIR}/CMakeCache.txt"; then
         exit 0;
     fi
 
-    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+    )";
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all cpack-${NAME} cpack-${CPP_LIB}-cpp';
 
-    test ${#component[@]} -eq 0 && component=(all);
+    out_dir="${o:+$(realpath -ms "${o}")}";
+
+    ((${#component[@]})) || component=(all);
 
     time (
         local comp;
@@ -78,7 +82,7 @@ cpack_${CPP_LIB}_cpp() {
             fi
         fi
 
-        if test -z "${name:-}" || test -z "${vers:-}"; then
+        if test -z "${name:-}"; then
             exit 1;
         fi
 
@@ -88,17 +92,18 @@ cpack_${CPP_LIB}_cpp() {
                 then comp="";
             fi
 
-            slug="${name}-${vers}${comp:+-$comp}-${kernel}";
+            slug="${name}${vers:+-$vers}${comp:+-$comp}-${kernel}";
             outd="${CPP_SRC}/${BIN_DIR}/_CPack_Packages/${kernel}/TGZ";
 
-            install-${CPP_LIB}-cpp -p "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}";
+            install-${CPP_LIB}-cpp --prefix "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}";
 
             if test -d "${outd}/${slug}"; then
                 tar -C "${outd}" -c ${v:+-v} -f "${outd}/${slug}.tar.gz" -I "pigz -p ${n_jobs}" "${slug}";
                 cp -a "${outd}/${slug}.tar.gz" "${CPP_SRC}/${BIN_DIR}/";
-                if test -d "${out_dir}"/ \
+                if test -n "${out_dir}" \
                 && test -f "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz"; then
-                    cp -a "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz" "${out_dir}"/;
+                    mkdir -p "${out_dir}/";
+                    cp -a "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz" "${out_dir}/";
                 fi
             fi
         done
@@ -107,4 +112,4 @@ cpack_${CPP_LIB}_cpp() {
     ) 2>&1;
 }
 
-cpack_${CPP_LIB}_cpp "$@";
+cpack_${CPP_LIB}_cpp "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
index 633330155..b986169d8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.install.tmpl.sh
@@ -5,36 +5,23 @@
 #
 # Install ${CPP_LIB}.
 #
-# Boolean options:
-#  -h,--help                    print this text
-#  -v,--verbose                 Enable verbose output.
-#  --strip                      Strip before installing.
-#
-# Options that require values:
-#  --component <comp>                           Component-based install. Only install component <comp>.
-#                                               (default: all)
-#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
-#                                               (default: none)
-#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
-#  -p,--prefix <dir>                            Install C++ library into <dir>
-#                                               (default: none)
+# @_include_cmake_install_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 install_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '--component --prefix' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -v,--verbose
-        --strip
-        --config
-        --default-directory-permissions
-    ' - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'install-all install-${NAME} install-${CPP_LIB}-cpp';
 
-    test ${#component[@]} -eq 0 && component=(all);
-    prefix="${p:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}";
+    ((${#component[@]})) || component=(all);
+
+    prefix="$(realpath -ms "${prefix:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}")";
 
     local comp;
     for comp in "${component[@]}"; do
@@ -42,14 +29,14 @@ install_${CPP_LIB}_cpp() {
             comp="";
         fi
         time (
-            cmake \
-                --install "${CPP_SRC}/${BIN_DIR}/"                              \
-                --prefix "${p:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}" \
-                ${comp:+--component "${comp}"}                                  \
-                "${OPTS[@]}";
+            cmake --install "${CPP_SRC}/${BIN_DIR}/" \
+                  --prefix "${prefix}"               \
+                  ${comp:+--component "${comp}"}     \
+                  $(rapids-select-cmake-install-args "${OPTS[@]}");
+
             { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB}${component:+ $component} install time:";
         ) 2>&1;
     done
 }
 
-install_${CPP_LIB}_cpp "$@";
+install_${CPP_LIB}_cpp "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index f1049e99b..8f967db27 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -6,15 +6,18 @@
 # Uninstall ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help          print this text
+#  -h,--help          Print this text.
 #  -v,--verbose       verbose output
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 uninstall_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME} uninstall-${CPP_LIB}-cpp';
 
@@ -26,4 +29,4 @@ uninstall_${CPP_LIB}_cpp() {
     fi
 }
 
-uninstall_${CPP_LIB}_cpp "$@";
+uninstall_${CPP_LIB}_cpp "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index 14ae0d63d..8f621b61c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -5,22 +5,14 @@
 #
 # Build ${PY_LIB} in editable mode.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
-#
-# Options that require values:
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#                                         (default: $(nproc))
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h;
+# @_include_cmake_options;
+# @_include_pip_install_options;
+# @_include_pip_package_index_options;
+# @_include_pip_general_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 is_using_scikit_build_core() {
     local -;
@@ -33,7 +25,7 @@ build_${PY_LIB}_python_editable() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
@@ -44,22 +36,24 @@ build_${PY_LIB}_python_editable() {
         rapids-get-num-archs-jobs-and-load "$@" \
     )";
 
-    local cmake_args=(${PY_CMAKE_ARGS});
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-editable';
 
-    cmake_args+=(${CMAKE_ARGS:-});
-    cmake_args+=(${CPP_DEPS});
-    cmake_args+=(${CPP_ARGS});
-    cmake_args+=(${v:+--log-level=VERBOSE});
-    cmake_args+=("${OPTS[@]}");
-
-    local ninja_args=();
-    local pip_args=(${PIP_INSTALL_ARGS});
+    local -a cmake_args_=(
+        ${PY_CMAKE_ARGS}
+        ${CMAKE_ARGS:-}
+        ${CPP_DEPS}
+        ${CPP_ARGS}
+        ${v:+--log-level=VERBOSE}
+    );
+
+    local -a cmake_args="(
+        ${cmake_args_+"${cmake_args_[*]@Q}"}
+        $(rapids-select-cmake-args "${ARGS[@]}")
+    )";
 
     if test -n "${v}"; then
         ninja_args+=("-v");
-        pip_args+=("-vv");
     fi
 
     if test -n "${n_jobs}"; then
@@ -70,8 +64,16 @@ build_${PY_LIB}_python_editable() {
         ninja_args+=("-l${n_load}");
     fi
 
+    local -a pip_args_=(${PIP_INSTALL_ARGS});
+    local -a pip_args="(
+        ${pip_args_+"${pip_args_[*]@Q}"}
+        $(rapids-select-pip-wheel-args "${ARGS[@]}")
+    )";
+
     if is_using_scikit_build_core; then
-        pip_args+=("--config-settings=build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
+        pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
+    else
+        export SETUPTOOLS_ENABLE_FEATURES="legacy-editable";
     fi
 
     pip_args+=("--no-build-isolation");
@@ -95,11 +97,10 @@ build_${PY_LIB}_python_editable() {
         CMAKE_ARGS="${cmake_args[*]}"                \
         SKBUILD_BUILD_OPTIONS="${ninja_args[*]}"     \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
-        SETUPTOOLS_ENABLE_FEATURES="legacy-editable" \
             python -m pip install "${pip_args[@]}"   \
         ;
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} install time:";
     ) 2>&1;
 }
 
-build_${PY_LIB}_python_editable "$@";
+build_${PY_LIB}_python_editable "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
index 7f8ffec42..42bd56c11 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.tmpl.sh
@@ -5,59 +5,33 @@
 #
 # Build an editable install or wheel of ${PY_LIB}.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
-#  --ignore-requires-python               Ignore the Requires-Python information.
-#  --no-clean                             Don't clean up build directories.
-#  --no-deps                              Don't install package dependencies.
-#  --no-verify                            Don't verify if built wheel is valid.
-#  --no-cache-dir                         Disable the pip cache.
-#  --use-pep517                           Use PEP 517 for building source distributions.
-#  --no-use-pep517                        Don't use PEP 517 for building source distributions
-#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
-#                                         dependencies specified by PEP 518 must be already installed if this option is
-#                                         used.
-#  --pre                                  Include pre-release and development versions. By default, pip only finds
-#                                         stable versions.
-#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
-#                                         newer.
-#
 # Options that require values:
 #  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
 #                                         (default: editable)
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#                                         (default: $(nproc))
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
-#  --cache-dir <dir>                      Store the cache data in <dir>.
-#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
-#                                         adds to the existing value. Accepts either ":all:" to disable all source
-#                                         packages, ":none:" to empty the set, or one or more package names with commas
-#                                         between them. Packages without binary distributions will fail to install when
-#                                         this option is used on them.
-#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
-#                                         (default: none)
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h | tail -n+2;
+# @_include_cmake_options;
+# If `--type=editable`:
+#
+# @_include_pip_install_options | tr '\n' '\0' | xargs -0 -r -I% echo "  %";
+# If `--type=wheel`:
+#
+# @_include_pip_wheel_options | tr '\n' '\0' | xargs -0 -r -I% echo "  %";
+# @_include_pip_package_index_options;
+# @_include_pip_general_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 build_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-t,--type' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" --take '
-        -t,--type
-    ' - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python';
 
     build-${PY_LIB}-python-${t:-${type:-"editable"}} "${OPTS[@]}";
 }
 
-build_${PY_LIB}_python "$@";
+build_${PY_LIB}_python "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 4dbf73306..051d4f83f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -5,44 +5,14 @@
 #
 # Build a ${PY_LIB} wheel.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
-#  --ignore-requires-python               Ignore the Requires-Python information.
-#  --no-clean                             Don't clean up build directories.
-#  --no-deps                              Don't install package dependencies.
-#  --no-verify                            Don't verify if built wheel is valid.
-#  --no-cache-dir                         Disable the pip cache.
-#  --use-pep517                           Use PEP 517 for building source distributions.
-#  --no-use-pep517                        Don't use PEP 517 for building source distributions
-#  --no-build-isolation                   Disable isolation when building a modern source distribution. Build
-#                                         dependencies specified by PEP 518 must be already installed if this option is
-#                                         used.
-#  --pre                                  Include pre-release and development versions. By default, pip only finds
-#                                         stable versions.
-#  --prefer-binary                        Prefer binary packages over source packages, even if the source packages are
-#                                         newer.
-#
-# Options that require values:
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#                                         (default: $(nproc))
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
-#  --cache-dir <dir>                      Store the cache data in <dir>.
-#  --only-binary <format_control>         Do not use source packages. Can be supplied multiple times, and each time
-#                                         adds to the existing value. Accepts either ":all:" to disable all source
-#                                         packages, ":none:" to empty the set, or one or more package names with commas
-#                                         between them. Packages without binary distributions will fail to install when
-#                                         this option is used on them.
-#  -w,--wheel-dir <dir>                   copy built wheel into <dir>
-#                                         (default: none)
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h;
+# @_include_cmake_options;
+# @_include_pip_wheel_options;
+# @_include_pip_package_index_options;
+# @_include_pip_general_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 is_using_scikit_build_core() {
     local -;
@@ -55,7 +25,7 @@ build_${PY_LIB}_python_wheel() {
     local -;
     set -euo pipefail;
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
+    eval "$(_parse_args "$@" <&0)";
 
     if [[ ! -d "${PY_SRC}" ]]; then
         exit 1;
@@ -66,88 +36,50 @@ build_${PY_LIB}_python_wheel() {
         rapids-get-num-archs-jobs-and-load "$@" \
     )";
 
-    local cmake_args=(${PY_CMAKE_ARGS});
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-wheel';
 
-    cmake_args+=(${CMAKE_ARGS:-});
-    cmake_args+=(${CPP_DEPS});
-    cmake_args+=(${CPP_ARGS});
-    cmake_args+=(${v:+--log-level=VERBOSE});
-    cmake_args+=("${OPTS[@]}");
+    local -a cmake_args_=(
+        ${PY_CMAKE_ARGS}
+        ${CMAKE_ARGS:-}
+        ${CPP_DEPS}
+        ${CPP_ARGS}
+        ${v:+--log-level=VERBOSE}
+    );
+
+    local -a cmake_args="(
+        ${cmake_args_+"${cmake_args_[*]@Q}"}
+        $(rapids-select-cmake-args "${ARGS[@]}")
+    )";
 
     local ninja_args=();
-    local pip_args=(${PIP_WHEEL_ARGS});
 
     if test -n "${v}"; then
         ninja_args+=("-v");
-        pip_args+=("-vv");
     fi
 
-    if test -n "${n_jobs}"; then
+    if test -n "${n_jobs-}"; then
         ninja_args+=("-j${n_jobs}");
     fi
 
-    if test -n "${n_load}"; then
+    if test -n "${n_load-}"; then
         ninja_args+=("-l${n_load}");
     fi
 
-    if test -n "${pre:-}"; then
-        pip_args+=("--pre");
-    fi
-
-    if test -n "${wheel_dir:-}"; then
-        pip_args+=("--wheel-dir" "${wheel_dir}");
-    fi
-
-    if test -n "${prefer_binary:-}"; then
-        pip_args+=("--prefer-binary");
-    fi
-
-    if test -n "${only_binary[@]:-}"; then
-        pip_args+=("--only-binary");
-        if test "${only_binary[@]}" != "true"; then
-            pip_args+=("${only_binary[@]}");
-        fi
-    fi
-
-    if test -n "${no_deps:-}"; then
-        pip_args+=("--no-deps");
-    fi
-
-    if test -n "${no_clean:-}"; then
-        pip_args+=("--no-clean");
-    fi
-
-    if test -n "${no_verify:-}"; then
-        pip_args+=("--no-verify");
-    fi
-
-    if test -n "${cache_dir:-}"; then
-        pip_args+=("--cache-dir" "${cache_dir:-}");
-    elif test -n "${no_cache_dir:-}"; then
-        pip_args+=("--no-cache-dir");
-    fi
-
-    if test -n "${use_pep517:-}"; then
-        pip_args+=("--use-pep517");
-    elif test -n "${no_use_pep517:-}"; then
-        pip_args+=("--no-use-pep517");
-    fi
+    local -a pip_args_=(${PIP_WHEEL_ARGS});
+    local -a pip_args="(
+        ${pip_args_+"${pip_args_[*]@Q}"}
+        $(rapids-select-pip-wheel-args "${ARGS[@]}")
+    )";
 
     case "${no_build_isolation:-$(pip config get wheel.no-build-isolation 2>/dev/null || echo)}" in
         True|true|yes|1)
-            pip_args+=("--no-build-isolation");
             if is_using_scikit_build_core; then
-                pip_args+=("--config-settings=build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
+                pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
             fi
             ;;
     esac
 
-    if test -n "${ignore_requires_python:-}"; then
-        pip_args+=("--ignore-requires-python");
-    fi
-
     pip_args+=("${PY_SRC}");
 
     trap "rm -rf '${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
@@ -164,10 +96,10 @@ build_${PY_LIB}_python_wheel() {
         CMAKE_ARGS="${cmake_args[*]}"            \
         SKBUILD_BUILD_OPTIONS="${ninja_args[*]}" \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
-            python -m pip wheel ${pip_args[@]}   \
+            python -m pip wheel "${pip_args[@]}" \
         ;
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} wheel build time:";
     ) 2>&1;
 }
 
-build_${PY_LIB}_python_wheel "$@";
+build_${PY_LIB}_python_wheel "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index b9313bfc5..dcf7b6800 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -6,14 +6,17 @@
 # Clean the ${PY_LIB} build dirs.
 #
 # Boolean options:
-#  -h,--help                    print this text
+#  -h,--help  Print this text.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 clean_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME} clean-${PY_LIB}-python';
 
@@ -51,4 +54,4 @@ clean_${PY_LIB}_python() {
     fi
 }
 
-clean_${PY_LIB}_python "$@";
+clean_${PY_LIB}_python "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index 9c3ea222c..56f58350d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -6,15 +6,18 @@
 # Uninstall ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help         print this text
-#  -v,--verbose      verbose output
+#  -h,--help     Print this text.
+#  -v,--verbose  Verbose output
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 uninstall_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME} uninstall-${PY_LIB}-python';
 
@@ -23,10 +26,10 @@ uninstall_${PY_LIB}_python() {
     fi
 
     time (
-        pip uninstall -y ${v:+-vv} "${PY_LIB}";
+        pip uninstall -y "${OPTS[@]}" "${PY_LIB}";
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} uninstall time:";
     ) 2>&1;
 
 }
 
-uninstall_${PY_LIB}_python "$@";
+uninstall_${PY_LIB}_python "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
index f008d2193..cb70fcf39 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.build.tmpl.sh
@@ -5,33 +5,24 @@
 #
 # Configure and build ${CPP_LIB}, then build an editable install or wheel of ${PY_LIB}.
 #
-# Boolean options:
-#  -h,--help                              print this text
-#  -v,--verbose                           verbose output
+# Forwards relevant arguments to each underlying script.
 #
-# Options that require values:
-#  -t,--type (editable|wheel)             The type of Python build to run (editable or wheel)
-#                                         (default: editable)
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#                                         (default: $(nproc))
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h;
+# @_include_cmake_options;
+# @_include_cmake_install_options;
+# @_include_pip_wheel_options;
+# @_include_pip_package_index_options;
+# @_include_pip_general_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 build_${NAME}() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-t,--type' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" --take '
-        -t,--type
-    ' - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME}';
 
@@ -48,4 +39,4 @@ build_${NAME}() {
     done
 }
 
-build_${NAME} "$@";
+build_${NAME} "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
index 8737ee389..279013555 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clean.tmpl.sh
@@ -6,27 +6,30 @@
 # Clean the ${NAME} repository.
 #
 # Boolean options:
-#  -h,--help          print this text
+#  -h,--help  Print this text.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 clean_${NAME}() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type clean-${lib}-cpp >/dev/null 2>&1; then
-            clean-${lib}-cpp "$@";
+            clean-${lib}-cpp "${OPTS[@]}";
         fi
     done
     for lib in ${PY_LIB}; do
         if type clean-${lib}-python >/dev/null 2>&1; then
-            clean-${lib}-python "$@";
+            clean-${lib}-python "${OPTS[@]}";
         fi
     done
 }
 
-clean_${NAME} "$@";
+clean_${NAME} "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index e075d3dd6..d10d2e38a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -6,74 +6,71 @@
 # Clone the ${NAME} repository if it doesn't already exist.
 #
 # Boolean options:
-#  -h,--help                    print this text
-#  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
-#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
-#                               (default: false)
-#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
-#                               (default: false)
-#  --clone-upstream             always clone the upstream, not the user's fork
+# @_include_bool_options /usr/bin/devcontainer-utils-clone-github-repo -h | tail -n+2 | head -n-1;
+#  --no-update-env              Don't update the Python env with the repo's dependencies after cloning.
 #                               (default: false)
 #
 # Options that require values:
-#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
-#                               (default: `${NAME}.git.tag` in manifest.yaml)
-#  -d,--directory <dir>         clone the repo into <dir>
+# @_include_value_options /usr/bin/devcontainer-utils-clone-github-repo -h | tail -n+2 | head -n-1;
+#  -d,--directory <dir>         Clone the repo into <dir>.
 #                               (default: `${NAME}.path` in manifest.yaml)
-#  -j,--parallel <num>          Clone <num> submodules in parallel
-#                               (default: $(nproc --ignore=1))
-#  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
+#  -u,--upstream <upstream>     Set <upstream> as the `upstream` remote.
 #                               (default: `${NAME}.git.upstream` in manifest.yaml)
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 clone_${NAME}() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '
+        --no-update-env
+        -b,--branch
+        -d,--directory
+        -u,--upstream
+    ' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" --skip '
-        -q,--quiet
-        --no-fork
-        --clone-upstream
-    ' - <<< "${@@Q}")";
+    eval "$(rapids-get-num-archs-jobs-and-load "$@")";
 
-    if [[ ! -d "${SRC_PATH}"/.git ]]; then
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all clone-${NAME}';
 
-        eval "$(rapids-get-num-archs-jobs-and-load "$@")";
+    if [[ -d "${SRC_PATH}"/.git ]]; then
+        return;
+    fi
 
-        branch="${b:-"${GIT_TAG}"}";
-        directory="${d:-"${SRC_PATH}"}";
-        upstream="${u:-"${GIT_UPSTREAM}/${GIT_REPO}"}";
+    branch="${b:-"${GIT_TAG}"}";
+    directory="${d:-"${SRC_PATH}"}";
+    upstream="${u:-"${GIT_UPSTREAM}/${GIT_REPO}"}";
 
-        echo 'Cloning ${NAME}' 1>&2;
+    echo 'Cloning ${NAME}' 1>&2;
 
-        devcontainer-utils-clone-${GIT_HOST}-repo \
-            --tags                                \
-            --branch "${branch}"                  \
-            --recurse-submodules                  \
-            -j ${n_jobs:-$(nproc --ignore=1)}     \
-            -c checkout.defaultRemote=upstream    \
-            "${OPTS[@]}"                          \
-            --                                    \
-            "${upstream}"                         \
-            "${directory}"                        \
-        ;
+    devcontainer-utils-clone-${GIT_HOST}-repo \
+        --tags                                \
+        --branch "${branch}"                  \
+        --recurse-submodules                  \
+        -j ${n_jobs:-$(nproc --ignore=1)}     \
+        -c checkout.defaultRemote=upstream    \
+        "${OPTS[@]}"                          \
+        --                                    \
+        "${upstream}"                         \
+        "${directory}"                        \
+    ;
 
-        git -C "${SRC_PATH}" config --add remote.upstream.fetch '^refs/heads/pull-request/*';
+    git -C "${SRC_PATH}" config --add remote.upstream.fetch '^refs/heads/pull-request/*';
 
-        local upstream_branches="$(git -C "${SRC_PATH}" branch --remotes --list 'upstream/pull-request/*')";
-        if test -n "${upstream_branches:-}"; then
-            git -C "${SRC_PATH}" branch --remotes -d ${upstream_branches};
-        fi
+    local upstream_branches="$(git -C "${SRC_PATH}" branch --remotes --list 'upstream/pull-request/*')";
+    if test -n "${upstream_branches:-}"; then
+        git -C "${SRC_PATH}" branch --remotes -d ${upstream_branches};
+    fi
 
-        git -C "${SRC_PATH}" remote prune upstream;
+    git -C "${SRC_PATH}" remote prune upstream;
 
-        if test -z "${no_update_env}"; then
-            rapids-update-content-command;
-            rapids-post-attach-command;
-        fi
+    if test -z "${no_update_env}"; then
+        rapids-update-content-command;
+        rapids-post-attach-command;
     fi
 }
 
-clone_${NAME} "$@";
+clone_${NAME} "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
index 3a756cf55..fa5cb78e4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.configure.tmpl.sh
@@ -5,38 +5,28 @@
 #
 # Runs the configure script in each ${CPP_LIB}.
 #
-# Forwards all arguments to each underlying script.
+# Forwards relevant arguments to each underlying script.
 #
-# Boolean options:
-#  -h,--help                    print this text
-#  -v,--verbose                 verbose output
-#
-# Options that require values:
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
-#                                         (default: 1)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
-#                                         is expected to take. This is used to estimate the number of parallel device
-#                                         object compilations that can be launched without hitting the system memory
-#                                         limit.
-#                                         Higher values yield fewer parallel CUDA device object compilations.
-#                                         (default: 1)
-#  -D* <var>[:<type>]=<value>             Create or update a cmake cache entry.
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h;
+# @_include_cmake_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 configure_${NAME}() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all configure-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type configure-${lib}-cpp >/dev/null 2>&1; then
-            configure-${lib}-cpp "$@";
+            configure-${lib}-cpp "${OPTS[@]}";
         fi
     done
 }
 
-configure_${NAME} "$@";
+configure_${NAME} "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
index cd96f11e7..393d8045b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.cpack.tmpl.sh
@@ -6,29 +6,33 @@
 # CPack ${CPP_LIB}.
 #
 # Boolean options:
-#  -h,--help                    print this text
-#  -v,--verbose                 verbose output
+#  -h,--help                                     Print this text.
+# @_include_bool_options rapids-select-cmake-install-args -h | tail -n-3 | head -n-1;
 #
 # Options that require values:
-#  -j,--parallel <num>          Use <num> to compress in parallel
-#                               (default: $(nproc))
-#  -o,--out-dir <dir>           copy cpack'd TGZ file into <dir>
-#                               (default: none)
+#  -j,--parallel <num>                           Use <num> threads to compress in parallel.
+#                                                (default: $(nproc))
+#  -o,--out-dir <dir>                            Copy cpack'd TGZ file into <dir>.
+#                                                (default: none)
+# @_include_value_options rapids-select-cmake-install-args -h | tail -n-5 | head -n-2;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 cpack_${NAME}() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all cpack-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type cpack-${lib}-cpp >/dev/null 2>&1; then
-            cpack-${lib}-cpp "$@";
+            cpack-${lib}-cpp "${OPTS[@]}";
         fi
     done
 }
 
-cpack_${NAME} "$@";
+cpack_${NAME} "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
index c4811db53..308184d16 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.install.tmpl.sh
@@ -3,36 +3,27 @@
 # Usage:
 #  install-${NAME} [OPTION]...
 #
-# Install ${CPP_LIB} and ${PY_LIB}.
+# Install ${CPP_LIB}.
 #
-# Boolean options:
-#  -h,--help          print this text
-#  -v,--verbose       verbose output
-#  --strip                      Strip before installing.
-#
-# Options that require values:
-#  -p,--prefix <dir>                            Install C++ library into <dir>
-#                                               (default: none)
-#  --config    <cfg>                            For multi-configuration generators, choose configuration <cfg>
-#                                               (default: none)
-#  --component <comp>                           Component-based install. Only install component <comp>.
-#                                               (default: all)
-#  --default-directory-permissions <permission> Default install permission. Use default permission <permission>.
+# @_include_cmake_install_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
 
 install_${NAME}() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'install-all install-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type install-${lib}-cpp >/dev/null 2>&1; then
-            install-${lib}-cpp "$@";
+            install-${lib}-cpp "${OPTS[@]}";
         fi
     done
 }
 
-install_${NAME} "$@";
+install_${NAME} "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index b85ca867e..080d897f1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -6,29 +6,32 @@
 # Uninstall ${CPP_LIB} and ${PY_LIB}.
 #
 # Boolean options:
-#  -h,--help          print this text
+#  -h,--help          Print this text.
 #  -v,--verbose       verbose output
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 uninstall_${NAME}() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args --take '-h,--help' "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME}';
 
     for lib in ${CPP_LIB}; do
         if type uninstall-${lib}-cpp >/dev/null 2>&1; then
-            uninstall-${lib}-cpp "$@";
+            uninstall-${lib}-cpp "${OPTS[@]}";
         fi
     done
 
     for lib in ${PY_LIB}; do
         if type uninstall-${lib}-python >/dev/null 2>&1; then
-            uninstall-${lib}-python "$@";
+            uninstall-${lib}-python "${OPTS[@]}";
         fi
     done
 }
 
-uninstall_${NAME} "$@";
+uninstall_${NAME} "$@" <&0;
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index ffa61ffa6..b6416eb88 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -59,57 +59,53 @@ chgrp crontab /var/log/devcontainer-utils-vault-s3-creds-refresh.log;
 # Install Devcontainer utility scripts to /opt/devcontainer
 cp -ar ./opt/devcontainer /opt/;
 
-find /opt/devcontainer \
-    \( -type d -exec chmod 0775 {} \; \
-    -o -type f -exec chmod 0755 {} \; \);
+declare -a commands_and_sources=(
+    "debug-output                       debug-output.sh"
+    "parse-args                         parse-args.sh"
+    "parse-args-from-docstring          parse-args-from-docstring.sh"
+    "bash-completion.tmpl               bash/completion.tmpl.sh"
+    "generate-bash-completion           bash/generate-bash-completion.sh"
+    "shell-is-interactive               shell-is-interactive.sh"
+    "post-create-command                post-create-command.sh"
+    "post-attach-command                post-attach-command.sh"
+    "post-attach-command-entrypoint     post-attach-command-entrypoint.sh"
+    "python-repl-startup                python-repl-startup.py"
+    "init-git                           git/init.sh"
+    "clone-git-repo                     git/repo/clone.sh"
+    "init-ssh-deploy-keys               ssh/init-deploy-keys.sh"
+    "init-github-cli                    github/cli/init.sh"
+    "clone-github-repo                  github/repo/clone.sh"
+    "init-gitlab-cli                    gitlab/cli/init.sh"
+    "clone-gitlab-repo                  gitlab/repo/clone.sh"
+    "print-missing-gitlab-token-warning gitlab/print-missing-token-warning.sh"
+    "vault-auth-github                  vault/auth/github.sh"
+    "vault-s3-init                      vault/s3/init.sh"
+    "vault-s3-creds-generate            vault/s3/creds/generate.sh"
+    "vault-s3-creds-persist             vault/s3/creds/persist.sh"
+    "vault-s3-creds-propagate           vault/s3/creds/propagate.sh"
+    "vault-s3-creds-schedule            vault/s3/creds/schedule.sh"
+    "vault-s3-creds-test                vault/s3/creds/test.sh"
+)
 
-install_utility() {
-    local cmd="devcontainer-utils-${1}";
-    local src="${2:-"${1}.sh"}";
-    # Install alternative
-    update-alternatives --install /usr/bin/${cmd} ${cmd} /opt/devcontainer/bin/${src} 0;
+# Install alternatives
+for entry in "${commands_and_sources[@]}"; do
+    declare -a pair=(${entry});
+    declare cmd="devcontainer-utils-${pair[0]}";
+    declare src="/opt/devcontainer/bin/${pair[1]}";
+    update-alternatives --install /usr/bin/${cmd} ${cmd} ${src} 0;
+done
 
-    # Install bash_completion script
-    devcontainer-utils-generate-bash-completion --command "${cmd}" --out-dir /etc/bash_completion.d;
-}
+declare -a commands="($(for pair in "${commands_and_sources[@]}"; do cut -d' ' -f1 <<< "${pair}"; done))";
 
-# Install alternatives
+# Install bash_completion script
+devcontainer-utils-generate-bash-completion                          \
+    --out-file /etc/bash_completion.d/devcontainer-utils-completions \
+    ${commands[@]/#/--command }                                      \
+;
 
-# Install these first since we use it in `install_utility`
-update-alternatives --install /usr/bin/devcontainer-utils-debug-output              devcontainer-utils-debug-output              /opt/devcontainer/bin/debug-output.sh                  0;
-update-alternatives --install /usr/bin/devcontainer-utils-parse-args                devcontainer-utils-parse-args                /opt/devcontainer/bin/parse-args.sh                    0;
-update-alternatives --install /usr/bin/devcontainer-utils-parse-args-from-docstring devcontainer-utils-parse-args-from-docstring /opt/devcontainer/bin/parse-args-from-docstring.sh     0;
-update-alternatives --install /usr/bin/devcontainer-utils-bash-completion.tmpl      devcontainer-utils-bash-completion.tmpl      /opt/devcontainer/bin/bash/completion.tmpl.sh          0;
-update-alternatives --install /usr/bin/devcontainer-utils-generate-bash-completion  devcontainer-utils-generate-bash-completion  /opt/devcontainer/bin/bash/generate-bash-completion.sh 0;
-
-# Generate a bash completion for bash-completion generating command
-devcontainer-utils-generate-bash-completion --command devcontainer-utils-generate-bash-completion --out-dir /etc/bash_completion.d;
-
-install_utility shell-is-interactive shell-is-interactive.sh;
-install_utility post-create-command post-create-command.sh;
-install_utility post-attach-command post-attach-command.sh;
-install_utility post-attach-command-entrypoint post-attach-command-entrypoint.sh;
-install_utility python-repl-startup python-repl-startup.py;
-install_utility init-git git/init.sh;
-install_utility clone-git-repo git/repo/clone.sh;
-
-install_utility init-ssh-deploy-keys ssh/init-deploy-keys.sh;
-
-install_utility init-github-cli   github/cli/init.sh;
-install_utility clone-github-repo github/repo/clone.sh;
-
-install_utility init-gitlab-cli                    gitlab/cli/init.sh;
-install_utility clone-gitlab-repo                  gitlab/repo/clone.sh;
-install_utility print-missing-gitlab-token-warning gitlab/print-missing-token-warning.sh;
-
-install_utility vault-auth-github vault/auth/github.sh;
-
-install_utility vault-s3-init            vault/s3/init.sh;
-install_utility vault-s3-creds-generate  vault/s3/creds/generate.sh;
-install_utility vault-s3-creds-persist   vault/s3/creds/persist.sh;
-install_utility vault-s3-creds-propagate vault/s3/creds/propagate.sh;
-install_utility vault-s3-creds-schedule  vault/s3/creds/schedule.sh;
-install_utility vault-s3-creds-test      vault/s3/creds/test.sh;
+find /opt/devcontainer \
+    \( -type d -exec chmod 0775 {} \; \
+    -o -type f -exec chmod 0755 {} \; \);
 
 # Enable GCC colors
 for_each_user_bashrc 'sed -i -re "s/^#(export GCC_COLORS)/\1/g" "$0"';
diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index 53cfa15ce..14498c963 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -10,10 +10,10 @@
 #  -v,--verbose                 verbose output
 #
 # Options that require values:
-#  -c,--command  <name>         Name of the command for which to generate the bash completion.
-#  -o,--out-dir  <path>         Path to the completion script output directory
-#                               (default: ${HOME}/.bash_completion.d)
-#  -t,--template <path>         Path to the bash completion script template file
+#  -c,--command  <name>         Command name(s) for which to generate bash completions.
+#  -o,--out-file <file>         Path to write the completion script file
+#                               (default: ${HOME}/.bash_completion.d/devcontainer-utils-completions)
+#  -t,--template <file>         Path to the bash completion script template file
 #                               (default: `which devcontainer-utils-bash-completion.tmpl`)
 
 generate_bash_completion() {
@@ -27,22 +27,22 @@ generate_bash_completion() {
     # shellcheck disable=SC1091
     . "${utils}/debug-output.sh" 'devcontainer_utils_debug' 'generate-bash-completion';
 
-    command="${c:?-c|--command is required}";
-    out_dir="$(realpath -m "${o:-"${HOME}/.bash_completion.d"}")";
+    : "${command:?-c|--command is required}";
+    out_file="$(realpath -m "${o:-"${HOME}/.bash_completion.d/devcontainer-utils-completions"}")";
     template="${t:-${COMPLETION_TMPL:-"$(which devcontainer-utils-bash-completion.tmpl)"}}";
 
     if test -f "${template}"; then
-        mkdir -p "${out_dir}";
-        local file="${out_dir}/devcontainer-utils-completions";
-        if ! test -f "${file}"; then
-            cp "${template}" "${file}";
-        fi
-
-        local str="complete -F _devcontainer_utils_completions ${command};";
-        if ! grep -q "${str}" "${file}"; then
-            echo "${str}" >> "${file}";
-        fi
+        mkdir -p "$(dirname "${out_file}")";
+        local file="${out_file}";
+        cp -n "${template}" "${out_file}";
+        local cmd;
+        for cmd in "${command[@]}"; do
+            local str="complete -F _devcontainer_utils_completions ${cmd};";
+            if ! grep -q "${str}" "${out_file}"; then
+                echo "${str}" >> "${out_file}";
+            fi
+        done
     fi
 }
 
-generate_bash_completion "$@";
+generate_bash_completion "$@" <&0;
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 0077c2ba5..f9e490ee2 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -6,13 +6,13 @@
 # Clone a git repository, optionally checking out a branch or tag, and optionally setting the upstream remote.
 #
 # Boolean options:
-#  -h,--help                    print this text
+#  -h,--help                    Print this text
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #
 # Options that require values:
-#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#  -b,--branch <branch_or_tag>  Check the repo out to <branch_or_tag>
 #  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel
-#  -u,--upstream <upstream>     set <upstream> as the `upstream` remote
+#  -u,--upstream <upstream>     Set <upstream> as the `upstream` remote
 #
 # Positional arguments:
 #  repository                   The (possibly remote) repository to clone
@@ -22,8 +22,8 @@ clone_git_repo() {
     local -;
     set -euo pipefail;
 
+    eval "$(devcontainer-utils-parse-args "$0" "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args "$0" - <<< "${@@Q}")";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'clone clone-git-repo';
 
@@ -103,4 +103,4 @@ clone_git_repo() {
     git -C "${directory}" submodule update --init --recursive ${j} ${q};
 }
 
-clone_git_repo "$@";
+clone_git_repo "$@" <&0;
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 865c06d0d..b59f691db 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -8,22 +8,22 @@
 # If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
 #
 # Boolean options:
-#  -h,--help                    print this text
+#  -h,--help                    Print this text.
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
-#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
+#  --no-fork                    Don't prompt the user to fork the repo if a user fork isn't found.
 #                               (default: false)
-#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
+#  --no-update-env              Don't update the Python env with the repo's dependencies after cloning.
 #                               (default: false)
-#  --clone-upstream             always clone the upstream, not the user's fork
+#  --clone-upstream             Always clone the upstream, not the user's fork.
 #                               (default: false)
 #
 # Options that require values:
-#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
-#  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel
+#  -b,--branch <branch_or_tag>  Check the repo out to <branch_or_tag>.
+#  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel.
 #
 # Positional arguments:
-#  upstream                     set <upstream> as the `upstream` remote
-#  directory                    clone the repo into <directory>
+#  upstream                     Set <upstream> as the `upstream` remote.
+#  directory                    Clone the repo into <directory>.
 
 get_default_branch() {
     local repo="${1}";
@@ -88,7 +88,7 @@ clone_github_repo() {
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
         -j,--jobs,--parallel
-    ' - <<< "${@@Q}")";
+    ' "$@" <&0)";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'clone clone-github-repo';
@@ -169,4 +169,4 @@ clone_github_repo() {
         ;
 }
 
-clone_github_repo "$@";
+clone_github_repo "$@" <&0;
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 8f280c5b6..11a26e634 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -8,22 +8,22 @@
 # If the user doesn't have a fork of the repository, notify the user and ask whether they would like to fork it.
 #
 # Boolean options:
-#  -h,--help                    print this text
+#  -h,--help                    Print this text.
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
-#  --no-fork                    don't prompt the user to fork the repo if a user fork isn't found
+#  --no-fork                    Don't prompt the user to fork the repo if a user fork isn't found.
 #                               (default: false)
-#  --no-update-env              don't update the Python env with the repo's dependencies after cloning
+#  --no-update-env              Don't update the Python env with the repo's dependencies after cloning.
 #                               (default: false)
-#  --clone-upstream             always clone the upstream, not the user's fork
+#  --clone-upstream             Always clone the upstream, not the user's fork.
 #                               (default: false)
 #
 # Options that require values:
-#  -b,--branch <branch_or_tag>  check the repo out to <branch_or_tag>
+#  -b,--branch <branch_or_tag>  Check the repo out to <branch_or_tag>.
 #  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel
 #
 # Positional arguments:
-#  upstream                     set <upstream> as the `upstream` remote
-#  directory                    clone the repo into <directory>
+#  upstream                     Set <upstream> as the `upstream` remote.
+#  directory                    Clone the repo into <directory>.
 
 get_default_branch() {
     local repo="${1}";
@@ -113,7 +113,7 @@ clone_gitlab_repo() {
     eval "$(devcontainer-utils-parse-args "$0" --skip '
         -q,--quiet
         -j,--jobs,--parallel
-    ' - <<< "${@@Q}")";
+    ' "$@" <&0)";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'clone clone-gitlab-repo';
@@ -194,4 +194,4 @@ clone_gitlab_repo() {
         ;
 }
 
-clone_gitlab_repo "$@";
+clone_gitlab_repo "$@" <&0;
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index d00fc180a..e24ddbbf0 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -33,8 +33,8 @@ persist_s3_creds() {
     local -;
     set -euo pipefail;
 
+    eval "$(devcontainer-utils-parse-args "$0" "$@" <&0)";
 
-    eval "$(devcontainer-utils-parse-args devcontainer-utils-vault-s3-creds-persist "$@" <&0)";
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'devcontainer_utils_debug' 'vault-s3 vault-s3-creds-persist';
 
@@ -105,5 +105,5 @@ ________EOF
 }
 
 if [ "$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]}-1]}")" = devcontainer-utils-vault-s3-creds-persist ]; then
-    persist_s3_creds "$@";
+    persist_s3_creds "$@" <&0;
 fi

From 416284d3caacfadc5171b53c8bf42ccb9f1d9dc0 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 13:30:42 -0800
Subject: [PATCH 132/217] remove --pull option from devcontainers

---
 .devcontainer/cuda11.8-conda/devcontainer.json | 1 -
 .devcontainer/cuda11.8-pip/devcontainer.json   | 1 -
 .devcontainer/cuda12.0-conda/devcontainer.json | 1 -
 .devcontainer/cuda12.0-pip/devcontainer.json   | 1 -
 4 files changed, 4 deletions(-)

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
index ad3405e0d..b08d2a26c 100644
--- a/.devcontainer/cuda11.8-conda/devcontainer.json
+++ b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -2,7 +2,6 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
-    "options": ["--pull"],
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "conda",
diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index 0d2f0d83a..3c3a0bbf6 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -2,7 +2,6 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
-    "options": ["--pull"],
     "args": {
       "CUDA": "11.8",
       "PYTHON_PACKAGE_MANAGER": "pip",
diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
index ed8417428..e3cb378ae 100644
--- a/.devcontainer/cuda12.0-conda/devcontainer.json
+++ b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -2,7 +2,6 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
-    "options": ["--pull"],
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "conda",
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index f54bd9cfc..d394dc74f 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -2,7 +2,6 @@
   "build": {
     "context": "${localWorkspaceFolder}/.devcontainer",
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/rapids.Dockerfile",
-    "options": ["--pull"],
     "args": {
       "CUDA": "12.0",
       "PYTHON_PACKAGE_MANAGER": "pip",

From 615987718d7e1b40d984c7f62b9029a0960426de Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 14:51:53 -0800
Subject: [PATCH 133/217] remove unused variable

---
 .../utils/opt/devcontainer/bin/bash/generate-bash-completion.sh  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
index 14498c963..64520c7be 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/generate-bash-completion.sh
@@ -33,7 +33,6 @@ generate_bash_completion() {
 
     if test -f "${template}"; then
         mkdir -p "$(dirname "${out_file}")";
-        local file="${out_file}";
         cp -n "${template}" "${out_file}";
         local cmd;
         for cmd in "${command[@]}"; do

From f950497b5bd61dfca6d465e951add2b2e0eace52 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 14 Feb 2024 16:33:02 -0800
Subject: [PATCH 134/217] guard against devcontainer-utils feature not being
 installed when running rapids-build-utils test.sh

---
 .../bin/generate-scripts.sh                   | 30 +++++++++++--------
 .../bin/make-vscode-workspace.sh              |  8 +++--
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 79da95069..da5300ad3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -12,24 +12,28 @@ generate_completions() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC1091
-    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
+    if type devcontainer-utils-debug-output >/dev/null 2>&1; then
+        # shellcheck disable=SC1091
+        . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
 
-    readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
+        readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
 
-    devcontainer-utils-generate-bash-completion          \
-        --out-file "$(realpath -m "${COMPLETION_FILE}")" \
-        --template "$(realpath -m "${COMPLETION_TMPL}")" \
-        ${commands[@]/#/--command }                      \
-    ;
+        devcontainer-utils-generate-bash-completion          \
+            --out-file "$(realpath -m "${COMPLETION_FILE}")" \
+            --template "$(realpath -m "${COMPLETION_TMPL}")" \
+            ${commands[@]/#/--command }                      \
+        ;
+    fi
 }
 
 clean_scripts_and_aliases() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC1091
-    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
+    if type devcontainer-utils-debug-output >/dev/null 2>&1; then
+        # shellcheck disable=SC1091
+        . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
+    fi
 
     readarray -t commands < <(find "${TMP_SCRIPT_DIR}"/ -maxdepth 1 -type f -exec basename {} \;);
     sudo rm -f -- \
@@ -154,8 +158,10 @@ generate_scripts() {
 
     eval "$(rapids-list-repos "$@")";
 
-    # shellcheck disable=SC1091
-    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
+    if type devcontainer-utils-debug-output >/dev/null 2>&1; then
+        # shellcheck disable=SC1091
+        . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
+    fi
 
     local -A cpp_name_to_path;
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
index 370220c74..ccb83859a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-vscode-workspace.sh
@@ -13,7 +13,7 @@ get_repos() {
     join \
       <(echo "${repos}" | sort -k 1b,1)                           \
       <(find ~ -maxdepth 1 -mindepth 1 -type d ! -name '.*' -exec \
-        bash -c "echo '${repos}' | grep \$(basename {})" \; \
+        bash -c "echo '${repos}' | grep \$(basename \$0)" {} \; \
       | sort -k 1b,1 | uniq) \
   | cut -d' ' -f3;
 }
@@ -75,8 +75,10 @@ make_vscode_workspace() {
     local -;
     set -euo pipefail;
 
-    # shellcheck disable=SC1091
-    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-vscode-workspace';
+    if type devcontainer-utils-debug-output >/dev/null 2>&1; then
+        # shellcheck disable=SC1091
+        . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'make-vscode-workspace';
+    fi
 
     cat<<EOF
 {

From 0359cde0c6f693f157838a97243e38116d1f5e95 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 15 Feb 2024 18:46:38 +0000
Subject: [PATCH 135/217] make hierarchy of latest symlinks

---
 .../bin/get-cmake-build-dir.sh                | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
index dea34b325..76d17a32f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -33,16 +33,23 @@ get_cmake_build_dir() {
     local -r type="$(rapids-select-cmake-build-type "$@" <&0 | tr '[:upper:]' '[:lower:]')";
     local -r cuda="$(grep -o '^[0-9]*.[0-9]*' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
 
-    bin+="${PYTHON_PACKAGE_MANAGER:+/${PYTHON_PACKAGE_MANAGER}}${cuda:+/cuda-${cuda}}";
+    bin+="${PYTHON_PACKAGE_MANAGER:+/${PYTHON_PACKAGE_MANAGER}}${cuda:+/cuda-${cuda}}/${type}";
 
     if test -n "${src:-}" && test -d "${src:-}"; then
         mkdir -p "${src}/${bin}";
-        (
-            cd "${src}/${bin}" || exit 1;
-            ln -sfn "${type}" latest;
-        );
+        local prefix;
+        local component;
+        for component in "build" "${PYTHON_PACKAGE_MANAGER:-}" "${cuda:+cuda-${cuda}}"; do
+            if test -n "${component:-}"; then
+                prefix+="${component}/";
+            (
+                cd "${src}/${prefix}" || exit 1;
+                ln -sfn "${bin#"${prefix}"}" latest;
+            )
+            fi
+        done
     fi
-    echo "${src:+${src}/}${bin}/${type}";
+    echo "$(realpath -m "${src:+${src}/}${bin}")";
 }
 
 get_cmake_build_dir "$@" <&0;

From 2105b50334b12de3b162ff583f8b5788a76f918c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 15 Feb 2024 20:43:22 +0000
Subject: [PATCH 136/217] make hierarchy of latest symlinks point at each
 other, update latest symlinks in post-attach

---
 features/src/rapids-build-utils/install.sh    |  2 +
 .../bin/generate-scripts.sh                   |  2 +-
 .../bin/get-cmake-build-dir.sh                | 43 +++++++++-----
 .../bin/post-attach-command.sh                |  1 +
 .../bin/python-uses-scikit-build-core.sh      |  6 ++
 .../rapids-build-utils/bin/query-manifest.sh  |  2 +
 .../bin/tmpl/cpp.configure.tmpl.sh            |  2 +-
 .../bin/tmpl/python.build.editable.tmpl.sh    | 11 +---
 .../bin/tmpl/python.build.wheel.tmpl.sh       | 11 +---
 .../bin/update-build-dir-links.sh             | 57 +++++++++++++++++++
 .../utils/opt/devcontainer/bin/parse-args.sh  |  7 +++
 11 files changed, 111 insertions(+), 33 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-uses-scikit-build-core.sh
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-build-dir-links.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 153f04338..92ae191f1 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -58,6 +58,7 @@ declare -a commands=(
     python-conda-pkg-names
     python-pkg-names
     python-pkg-roots
+    python-uses-scikit-build-core
     query-manifest
     select-cmake-args
     select-cmake-build-args
@@ -67,6 +68,7 @@ declare -a commands=(
     select-cmd-args
     select-pip-install-args
     select-pip-wheel-args
+    update-build-dir-links
     update-content-command
 );
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index da5300ad3..a920179bd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -170,7 +170,7 @@ generate_scripts() {
     local k;
 
     local repo_names=();
-    local -r bin_dir="$(dirname "$(rapids-get-cmake-build-dir)")/latest";
+    local -r bin_dir="$(rapids-get-cmake-build-dir --skip-build-type)";
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
index 76d17a32f..0662076ea 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  rapids-get-cmake-build-dir <source_path> [cmake_args]...
+#  rapids-get-cmake-build-dir [OPTIONS] [--] <source_path> [cmake_args]...
 #
 # Build a path to the build directory for a C++ or scikit-build-core Python library.
 # If the <source_path> is not null and a valid directory, retarget the `build/(pip|conda)/cuda-X.Y.Z/latest` symlink
@@ -15,41 +15,58 @@
 # This allows users to persist C++ and Python builds per [package manager] x [CUDA Toolkit] x [build type] combination,
 # meaning they don't need to do a clean build if switching between devcontainers or build types.
 #
+# Boolean options:
+#  -h,--help          Print this text.
+#  --skip-build-type  Don't update the symlink pointing to the last component of
+#                     the build dir path, i.e. "latest -> (debug|release)".
+#
 # Positional arguments:
 # source_path      The C++ or Python project source path
 # [cmake_args]...  The list of CMake arguments to search for the CMAKE_BUILD_TYPE
 
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
 get_cmake_build_dir() {
     local -;
     set -euo pipefail;
 
+    eval "$(_parse_args "$@" <&0)";
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'get-cmake-build-dir';
 
-    local src="${1:-}";
-    if test $# -gt 0; then shift; fi;
+    if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
 
     local bin="build";
-    local -r type="$(rapids-select-cmake-build-type "$@" <&0 | tr '[:upper:]' '[:lower:]')";
+    local src="${REST[0]:-}";
+    local -r type="$(rapids-select-cmake-build-type "${OPTS[@]}" "${REST[@]:1}" | tr '[:upper:]' '[:lower:]')";
     local -r cuda="$(grep -o '^[0-9]*.[0-9]*' <<< "${CUDA_VERSION:-${CUDA_VERSION_MAJOR:-12}.${CUDA_VERSION_MINOR:-0}}")";
 
-    bin+="${PYTHON_PACKAGE_MANAGER:+/${PYTHON_PACKAGE_MANAGER}}${cuda:+/cuda-${cuda}}/${type}";
+    bin+="${PYTHON_PACKAGE_MANAGER:+/${PYTHON_PACKAGE_MANAGER}}${cuda:+/cuda-${cuda}}";
 
     if test -n "${src:-}" && test -d "${src:-}"; then
         mkdir -p "${src}/${bin}";
-        local prefix;
+        if test -z "${skip_build_type-}"; then
+            mkdir -p "${src}/${bin}/${type}";
+            cd "${src}/${bin}/" || exit 1;
+            ln -sfn "${type}" latest;
+        fi
+        cd "${src}/build" || exit 1;
         local component;
-        for component in "build" "${PYTHON_PACKAGE_MANAGER:-}" "${cuda:+cuda-${cuda}}"; do
+        for component in "${PYTHON_PACKAGE_MANAGER:-}" "${cuda:+cuda-${cuda}}"; do
             if test -n "${component:-}"; then
-                prefix+="${component}/";
-            (
-                cd "${src}/${prefix}" || exit 1;
-                ln -sfn "${bin#"${prefix}"}" latest;
-            )
+                ln -sfn "${component}/latest" latest;
+                cd "${component}" || exit 1;
             fi
         done
     fi
-    echo "$(realpath -m "${src:+${src}/}${bin}")";
+    if test -n "${skip_build_type-}"; then
+        echo "${src:+${src}/}${bin}/latest";
+    else
+        echo "${src:+${src}/}${bin}/${type}";
+    fi
+    # echo "$(realpath -m "${src:+${src}/}${bin}/${type}")";
 }
 
 get_cmake_build_dir "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
index b1d9cf539..a620ff90b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_ATTACH_COMMAND:-}"; then
+    rapids-update-build-dir-links;
     if test -n "${PYTHON_PACKAGE_MANAGER:-}"; then
         rapids-make-"${PYTHON_PACKAGE_MANAGER}"-env || true;
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-uses-scikit-build-core.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-uses-scikit-build-core.sh
new file mode 100755
index 000000000..1d74057f9
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/python-uses-scikit-build-core.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e;
+
+test -f "${1}/pyproject.toml";
+test "scikit_build_core.build" = "$(python -c "import toml; print(toml.load('${1}/pyproject.toml')['build-system']['build-backend'])" 2>/dev/null)";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
index 04e66ec77..1a3343f30 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/query-manifest.sh
@@ -21,6 +21,8 @@ query_manifest() {
 
     eval "$(_parse_args "$@" <&0)";
 
+    if test "${REST[0]:-}" == --; then REST=("${REST[@]:1}"); fi;
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'query-manifest';
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index e165855b8..75e71d33c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -41,7 +41,7 @@ configure_${CPP_LIB}_cpp() {
         $(rapids-select-cmake-args "${ARGS[@]}")
     )";
 
-    local -r bin_dir="$(rapids-get-cmake-build-dir "${CPP_SRC}" "${cmake_args[@]}")";
+    local -r bin_dir="$(rapids-get-cmake-build-dir -- "${CPP_SRC}" "${cmake_args[@]}")";
 
     # Reconfigure if previous configure failed
     if [[ ! -f "${bin_dir}/build.ninja" ]]; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index 8f621b61c..a4eb0536c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -14,13 +14,6 @@
 # shellcheck disable=SC1091
 . rapids-generate-docstring;
 
-is_using_scikit_build_core() {
-    local -;
-    set -euo pipefail;
-    test -f "${PY_SRC}/pyproject.toml";
-    test "scikit_build_core.build" = "$(python -c "import toml; print(toml.load('${PY_SRC}/pyproject.toml')['build-system']['build-backend'])")";
-}
-
 build_${PY_LIB}_python_editable() {
     local -;
     set -euo pipefail;
@@ -70,8 +63,8 @@ build_${PY_LIB}_python_editable() {
         $(rapids-select-pip-wheel-args "${ARGS[@]}")
     )";
 
-    if is_using_scikit_build_core; then
-        pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
+    if rapids-python-uses-scikit-build-core "${PY_SRC}"; then
+        pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${PY_SRC}" "${cmake_args[@]}")");
     else
         export SETUPTOOLS_ENABLE_FEATURES="legacy-editable";
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 051d4f83f..182749a39 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -14,13 +14,6 @@
 # shellcheck disable=SC1091
 . rapids-generate-docstring;
 
-is_using_scikit_build_core() {
-    local -;
-    set -euo pipefail;
-    test -f "${PY_SRC}/pyproject.toml";
-    test "scikit_build_core.build" = "$(python -c "import toml; print(toml.load('${PY_SRC}/pyproject.toml')['build-system']['build-backend'])")";
-}
-
 build_${PY_LIB}_python_wheel() {
     local -;
     set -euo pipefail;
@@ -74,8 +67,8 @@ build_${PY_LIB}_python_wheel() {
 
     case "${no_build_isolation:-$(pip config get wheel.no-build-isolation 2>/dev/null || echo)}" in
         True|true|yes|1)
-            if is_using_scikit_build_core; then
-                pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir "${PY_SRC}" "${cmake_args[@]}")");
+            if rapids-python-uses-scikit-build-core "${PY_SRC}"; then
+                pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${PY_SRC}" "${cmake_args[@]}")");
             fi
             ;;
     esac
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-build-dir-links.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-build-dir-links.sh
new file mode 100755
index 000000000..0731c8f3f
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-build-dir-links.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-update-build-dir-links [OPTION]...
+#
+# List python package names as determined by manifest.yaml
+#
+# Boolean options:
+#  -h,--help             Print this text.
+#
+# Options that require values:
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+update_build_dir_links() {
+    local -;
+    set -euo pipefail;
+
+    eval "$(_parse_args "$@" <&0)";
+
+    eval "$(rapids-list-repos "$@")";
+
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'update-build-dir-links';
+
+    local i;
+    local j;
+
+    for ((i=0; i < ${repos_length:-0}; i+=1)); do
+
+        local repo="repos_${i}";
+        local repo_path="${repo}_path";
+        local cpp_length="${repo}_cpp_length";
+        local py_length="${repo}_python_length";
+
+        if test -d ~/"${!repo_path:-}/.git"; then
+
+            for ((j=0; j < ${!cpp_length:-0}; j+=1)); do
+                local cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
+                local cpp_path=~/"${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
+                rapids-get-cmake-build-dir --skip-build-type -- "${cpp_path}" >/dev/null;
+            done
+
+            for ((j=0; j < ${!py_length:-0}; j+=1)); do
+                local py_sub_dir="${repo}_python_${j}_sub_dir";
+                local py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
+                if rapids-python-uses-scikit-build-core "${py_path}"; then
+                    rapids-get-cmake-build-dir --skip-build-type -- "${py_path}" >/dev/null;
+                fi
+            done
+        fi
+    done
+}
+
+update_build_dir_links "$@" <&0;
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 468cfabb1..dadc09d98 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -124,6 +124,13 @@ _parse_args_for_file() {
             continue;
         fi
 
+        # If the first arg is `--`, break.
+        if [[ "${1:-}" == -- ]]; then
+            rest=("${@}");
+            set --;
+            break;
+        fi
+
         while getopts ":${optstring}${longoptstring:-}" opt; do
 
             arg=();

From d865c8a65ecb5eb68fc23c4b3cca1e1c13ed0309 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 16 Feb 2024 03:05:27 +0000
Subject: [PATCH 137/217] fix completion generation in install.sh

---
 features/src/rapids-build-utils/install.sh | 2 +-
 features/src/utils/install.sh              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 92ae191f1..142bde1b0 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -81,7 +81,7 @@ done
 if type devcontainer-utils-generate-bash-completion >/dev/null 2>&1; then
     devcontainer-utils-generate-bash-completion                          \
         --out-file /etc/bash_completion.d/rapids-build-utils-completions \
-        ${commands[@]/#/--command }                                      \
+        ${commands[@]/#/--command rapids-}                               \
     ;
 fi
 
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index b6416eb88..0d5b56936 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -100,7 +100,7 @@ declare -a commands="($(for pair in "${commands_and_sources[@]}"; do cut -d' ' -
 # Install bash_completion script
 devcontainer-utils-generate-bash-completion                          \
     --out-file /etc/bash_completion.d/devcontainer-utils-completions \
-    ${commands[@]/#/--command }                                      \
+    ${commands[@]/#/--command devcontainer-utils-}                   \
 ;
 
 find /opt/devcontainer \

From b006094b4eb8b8930fc212022bf017950bc76caf Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 16 Feb 2024 05:58:31 +0000
Subject: [PATCH 138/217] fix checkout-same-branch when branch names have
 slashes

---
 .../opt/rapids-build-utils/bin/checkout-same-branch.sh          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 24f3dfb40..fe91ae0e3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -125,7 +125,7 @@ checkout_same_branch() {
         fi
 
         local remote="${branch_name/\/*}";
-        local branch="${branch_name/*\/}";
+        local branch="${branch_name/#"${remote}/"}";
 
         git -C ~/${!repo_path} fetch "${remote}" "refs/heads/${branch}";
 

From 50053a9772babb111bb27a759ebee7b331486e4a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 16 Feb 2024 00:58:04 -0800
Subject: [PATCH 139/217] ensure directory permissions are set all the way down

---
 features/src/utils/install.sh | 36 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 0d5b56936..35d84161b 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -132,18 +132,20 @@ gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAA
 EOF
 )";
 
+# shellcheck disable=SC2174
 for dir in $(for_each_user_bashrc 'echo "$(dirname "$(realpath -m "$0")")"'); do
     # Copy in default git config
     rm -f "${dir}"/.gitconfig;
     cp .gitconfig "${dir}"/.gitconfig.default;
     # Copy in default .bash_completion
     cp .bash_completion "${dir}"/.bash_completion;
-    # Create ~/.cache, i.e. $XDG_CACHE_HOME
-    mkdir -p -m 0755 "${dir}"/.cache;
-    # Create ~/.cache, i.e. $XDG_CONFIG_HOME
-    mkdir -p -m 0755 "${dir}"/.config/{clangd,pip};
-    # Create ~/.local/state, i.e. $XDG_STATE_HOME
-    mkdir -p -m 0755 "${dir}"/.local/state;
+    mkdir -p -m 0755                                    \
+        `# Create ~/.cache, i.e. $XDG_CACHE_HOME`       \
+        "${dir}"/.cache                                 \
+        `# Create ~/.config, i.e. $XDG_CONFIG_HOME`     \
+        "${dir}"/.config "${dir}"/.config/{clangd,pip}  \
+        `# Create ~/.local/state, i.e. $XDG_STATE_HOME` \
+        "${dir}"/.local "${dir}"/.local/{bin,state}     \
     # Create or update ~/.ssh/known_hosts
     mkdir -p -m 0700 "${dir}"/.ssh;
     touch "${dir}"/.ssh/known_hosts;
@@ -160,19 +162,15 @@ rm -rf /root/.config/{clangd,pip};
 # Find the non-root user
 find_non_root_user;
 
-USERHOME="$(bash -c "echo ~${USERNAME}")";
-
-# Add user to the crontab group
-usermod -aG crontab "${USERNAME}";
-
-# Allow user to edit the crontab
-echo "${USERNAME}" >> /etc/cron.allow;
-
-# Create ~/.cache, i.e. $XDG_CONFIG_HOME
-mkdir -p -m 0755 "${USERHOME}"/.local/bin;
-
-# Ensure the user owns their homedir
-chown -R "${USERNAME}:${USERNAME}" "${USERHOME}";
+if test -n "${USERNAME-}"; then
+    USERHOME="$(bash -c "echo ~${USERNAME-}")";
+    # Add user to the crontab group
+    usermod -aG crontab "${USERNAME}";
+    # Allow user to edit the crontab
+    echo "${USERNAME}" >> /etc/cron.allow;
+    # Ensure the user owns their homedir
+    chown -R "${USERNAME}:${USERNAME}" "${USERHOME}";
+fi
 
 # Generate bash completions
 if dpkg -s bash-completion >/dev/null 2>&1; then

From 662eca719b6b264debdc910faccf23166f18a012 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 16 Feb 2024 18:39:14 +0000
Subject: [PATCH 140/217] support --remote and --default-branch flags in
 rapids-pull-repositories

---
 .../bin/pull-repositories.sh                  | 47 ++++++++++++++-----
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
index a45be3273..e82d8691d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/pull-repositories.sh
@@ -6,9 +6,13 @@
 # Pull the latest commits from each repository's upstream remote.
 #
 # Boolean options:
-#  -h,--help             Print this text.
+#  -h,--help                    Print this text.
 #
 # Options that require values:
+#  --remote            <remote>  The name of the remote from which to pull.
+#                                (default: upstream)
+#  -b,--default-branch <branch>  The name of the branch to use if the current branch isn't found in <remote>.
+#                                (default: none)
 # @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
 
 # shellcheck disable=SC1091
@@ -25,6 +29,9 @@ pull_repositories() {
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'pull-repositories';
 
+    : "${remote:="upstream"}";
+    : "${default_branch:=""}";
+
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
         local repo="repos_${i}";
@@ -35,27 +42,41 @@ pull_repositories() {
             continue;
         fi;
 
-        echo "Pulling ${!repo_name}..."
-        git -C ~/${!repo_path} fetch --no-tags upstream;
-        git -C ~/${!repo_path} fetch --no-tags origin;
+        echo "Fetching ${!repo_name} ${remote} branches...";
+
+        git -C ~/${!repo_path} fetch --no-tags "${remote}";
 
-        local branch_name="$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD)";
+        local branch="$(git -C ~/${!repo_path} rev-parse --abbrev-ref HEAD)";
 
-        while [[ -z "$(git -C ~/${!repo_path} branch -r | grep upstream/${branch_name})" ]]; do
+        while true; do
+            if test -n "${branch:-}" \
+            && git -C ~/${!repo_path} branch -r | grep "${remote}/${branch}"; then
+                break;
+            fi
+            if test -n "${default_branch:-}" \
+            && git -C ~/${!repo_path} branch -r | grep "${remote}/${default_branch}"; then
+                branch="${default_branch}";
+                break;
+            fi
 
-            local upstream_info="$(git -C ~/${!repo_path} remote -v show | grep upstream | head -n1)";
+            local remote_info="$(git -C ~/${!repo_path} remote -v show | grep "${remote}" | head -n1)";
 
             read -rp "
 ############################################################
-Branch \"$branch_name\" not found in:
-${upstream_info}
+Branch \"${branch}\" $(
+if test -n "${default_branch}"; then
+    echo "and \"${default_branch}\"";
+fi
+) not found in:
+${remote_info}
 ############################################################
 
-Please enter a branch name to pull (or leave empty to skip): " branch_name </dev/tty
-        done;
+Please enter a branch name to pull (or leave empty to skip): " branch </dev/tty
+        done
 
-        if [[ -n "${branch_name}" ]]; then
-            git -C ~/${!repo_path} pull --no-tags upstream "${branch_name}";
+        if test -n "${branch:-}"; then
+            echo "Pulling ${!repo_name} ${remote}/${branch}...";
+            git -C ~/${!repo_path} pull --no-tags "${remote}" "${branch}";
             git -C ~/${!repo_path} submodule update --init --recursive;
         else
             echo "No alternate branch name supplied, skipping";

From d0206bf662406f4fb5dd3365af5662346ce51d4e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Fri, 16 Feb 2024 20:54:22 +0000
Subject: [PATCH 141/217] use free mem not available mem

---
 .../opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index d5490a2ec..c75f049a2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -78,7 +78,7 @@ get_num_archs_jobs_and_load() {
     # Clamp between 1 and ${max_archs} threads per nvcc job
     n_arch=$(( n_arch < 1 ? 1 : n_arch > max_archs ? max_archs : n_arch ));
 
-    local -r free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
+    local -r free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
     local -r freeswap=$(free --giga | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
     local all_cpus="${parallel}";
     local n_load="${all_cpus}";

From 102b8faee8f9f811785f6035c5b53d377017121e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Sat, 17 Feb 2024 01:08:22 +0000
Subject: [PATCH 142/217] handle case where github and gitlab API calls fail to
 return the remote URLs

---
 .../opt/devcontainer/bin/github/repo/clone.sh | 35 +++++++++++--------
 .../opt/devcontainer/bin/gitlab/repo/clone.sh | 35 +++++++++++--------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index b59f691db..652a06284 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -142,30 +142,35 @@ clone_github_repo() {
         done
     fi
 
+    local origin_;
+    local upstream_;
+
     if gh auth status >/dev/null 2>&1; then
         if [ "$(gh config get git_protocol)" = "ssh" ]; then
-            origin="$(get_repo_ssh_url "${origin}")";
-            upstream="$(get_repo_ssh_url "${upstream}")";
+            origin_="$(get_repo_ssh_url "${origin}")";
+            upstream_="$(get_repo_ssh_url "${upstream}")";
         else
-            origin="$(get_repo_git_url "${origin}")";
-            upstream="$(get_repo_git_url "${upstream}")";
+            origin_="$(get_repo_git_url "${origin}")";
+            upstream_="$(get_repo_git_url "${upstream}")";
         fi
-    else
+    fi
+
+    if test -z "${origin_:-}" || test -z "${upstream_:-}"; then
         if [ "$(gh config get git_protocol)" = "ssh" ]; then
-            origin="git@${GITHUB_HOST:-github.com}:${origin}.git";
-            upstream="git@${GITHUB_HOST:-github.com}:${upstream}.git";
+            origin_="${origin_:-"git@${GITHUB_HOST:-github.com}:${origin}.git"}";
+            upstream_="${upstream_:-"git@${GITHUB_HOST:-github.com}:${upstream}.git"}";
         else
-            origin="https://${GITHUB_HOST:-github.com}/${origin}.git";
-            upstream="https://${GITHUB_HOST:-github.com}/${upstream}.git";
+            origin_="${origin_:-"https://${GITHUB_HOST:-github.com}/${origin}.git"}";
+            upstream_="${upstream_:-"https://${GITHUB_HOST:-github.com}/${upstream}.git"}";
         fi
     fi
 
-    devcontainer-utils-clone-git-repo         \
-        ${branch:+--branch "${branch}"}       \
-        ${upstream:+--upstream "${upstream}"} \
-        "${OPTS[@]}"                          \
-        --                                    \
-        "${origin}" "${REST[@]}"              \
+    devcontainer-utils-clone-git-repo          \
+        ${branch:+--branch "${branch}"}        \
+        ${upstream:+--upstream "${upstream_}"} \
+        "${OPTS[@]}"                           \
+        --                                     \
+        "${origin_}" "${REST[@]}"              \
         ;
 }
 
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 11a26e634..826276844 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -167,30 +167,35 @@ clone_gitlab_repo() {
         done
     fi
 
+    local origin_;
+    local upstream_;
+
     if ! glab auth status 2>&1 | grep -q "No token provided"; then
         if [ "$(glab config get git_protocol)" = "ssh" ]; then
-            origin="$(get_repo_ssh_url "${origin}")";
-            upstream="$(get_repo_ssh_url "${upstream}")";
+            origin_="$(get_repo_ssh_url "${origin}")";
+            upstream_="$(get_repo_ssh_url "${upstream}")";
         else
-            origin="$(get_repo_git_url "${origin}")";
-            upstream="$(get_repo_git_url "${upstream}")";
+            origin_="$(get_repo_git_url "${origin}")";
+            upstream_="$(get_repo_git_url "${upstream}")";
         fi
-    else
+    fi
+
+    if test -z "${origin_:-}" || test -z "${upstream_:-}"; then
         if [ "$(glab config get git_protocol)" = "ssh" ]; then
-            origin="git@${GITLAB_HOST:-gitlab.com}:${origin}.git";
-            upstream="git@${GITLAB_HOST:-gitlab.com}:${upstream}.git";
+            origin_="${origin_:-"git@${GITLAB_HOST:-gitlab.com}:${origin}.git"}";
+            upstream_="${upstream_:-"git@${GITLAB_HOST:-gitlab.com}:${upstream}.git"}";
         else
-            origin="https://${GITLAB_HOST:-gitlab.com}/${origin}.git";
-            upstream="https://${GITLAB_HOST:-gitlab.com}/${upstream}.git";
+            origin_="${origin_:-"https://${GITLAB_HOST:-gitlab.com}/${origin}.git"}";
+            upstream_="${upstream_:-"https://${GITLAB_HOST:-gitlab.com}/${upstream}.git"}";
         fi
     fi
 
-    devcontainer-utils-clone-git-repo         \
-        ${branch:+--branch "${branch}"}       \
-        ${upstream:+--upstream "${upstream}"} \
-        "${OPTS[@]}"                          \
-        --                                    \
-        "${origin}" "${REST[@]}"              \
+    devcontainer-utils-clone-git-repo          \
+        ${branch:+--branch "${branch}"}        \
+        ${upstream:+--upstream "${upstream_}"} \
+        "${OPTS[@]}"                           \
+        --                                     \
+        "${origin_}" "${REST[@]}"              \
         ;
 }
 

From 22b7128e82085fa3568d10fdd5b6a22d5a322b88 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 20 Feb 2024 13:26:15 -0800
Subject: [PATCH 143/217] pass additional arguments to devcontainer build

---
 scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index a0e61fdc8..c4eea6322 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -36,7 +36,7 @@ build_devcontainer() {
         --workspace-folder "${workspace}" \
         --cache-from "docker.io/rapidsai/devcontainers:${tag}" \
         --image-name "docker.io/rapidsai/devcontainers:${tag}" \
-        ;
+        "${@:3}";
 }
 
 build_devcontainer "$@";

From 2c6e52f907d467412facab1d3d208df12165fe0d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 20 Feb 2024 21:45:13 +0000
Subject: [PATCH 144/217] install devcontainer-utils features

---
 .devcontainer/cuda12.2-conda/devcontainer.json | 2 ++
 .devcontainer/cuda12.2-pip/devcontainer.json   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.devcontainer/cuda12.2-conda/devcontainer.json b/.devcontainer/cuda12.2-conda/devcontainer.json
index 6ab96272f..acf8719ce 100644
--- a/.devcontainer/cuda12.2-conda/devcontainer.json
+++ b/.devcontainer/cuda12.2-conda/devcontainer.json
@@ -10,9 +10,11 @@
   },
   "hostRequirements": {"gpu": "optional"},
   "features": {
+    "./features/src/utils": {},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
+    "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.2-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json
index 2dffc1cfd..78b4c18dd 100644
--- a/.devcontainer/cuda12.2-pip/devcontainer.json
+++ b/.devcontainer/cuda12.2-pip/devcontainer.json
@@ -12,11 +12,13 @@
   "features": {
     "./features/src/ucx": {"version": "1.14.1"},
     "./features/src/cuda": {"version": "12.2", "installcuBLAS": true, "installcuDNN": true, "installcuSOLVER": true, "installcuRAND": true, "installcuSPARSE": true},
+    "./features/src/utils": {},
     "./features/src/rapids-build-utils": {}
   },
   "overrideFeatureInstallOrder": [
     "./features/src/ucx",
     "./features/src/cuda",
+    "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.2-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],

From c21ed2915012af89c9cde5df5b07c5bf743505db Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 20 Feb 2024 21:47:28 +0000
Subject: [PATCH 145/217] add tasks-shell-input extension, files and search
 excludes for CUDA 12.2 devcontainers

---
 .../cuda11.8-conda/devcontainer.json          |  1 +
 .devcontainer/cuda11.8-pip/devcontainer.json  |  1 +
 .../cuda12.0-conda/devcontainer.json          |  1 +
 .devcontainer/cuda12.0-pip/devcontainer.json  |  1 +
 .../cuda12.2-conda/devcontainer.json          | 23 ++++++++++++++++++-
 .devcontainer/cuda12.2-pip/devcontainer.json  | 23 ++++++++++++++++++-
 6 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
index b08d2a26c..bff8470ba 100644
--- a/.devcontainer/cuda11.8-conda/devcontainer.json
+++ b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -44,6 +44,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "augustocdias.tasks-shell-input",
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
       ],
diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index f4cd97453..9f325bbe0 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -47,6 +47,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "augustocdias.tasks-shell-input",
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
       ],
diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
index e3cb378ae..48bdb5142 100644
--- a/.devcontainer/cuda12.0-conda/devcontainer.json
+++ b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -44,6 +44,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "augustocdias.tasks-shell-input",
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
       ],
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index 3692a3ee4..fe28c33c4 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -47,6 +47,7 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "augustocdias.tasks-shell-input",
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
       ],
diff --git a/.devcontainer/cuda12.2-conda/devcontainer.json b/.devcontainer/cuda12.2-conda/devcontainer.json
index acf8719ce..c36dba606 100644
--- a/.devcontainer/cuda12.2-conda/devcontainer.json
+++ b/.devcontainer/cuda12.2-conda/devcontainer.json
@@ -44,9 +44,30 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "augustocdias.tasks-shell-input",
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
-      ]
+      ],
+      "files.watcherExclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/target/**": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      },
+      "search.exclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/*.code-search": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      }
     }
   }
 }
diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json
index 78b4c18dd..bec305ba5 100644
--- a/.devcontainer/cuda12.2-pip/devcontainer.json
+++ b/.devcontainer/cuda12.2-pip/devcontainer.json
@@ -47,9 +47,30 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "augustocdias.tasks-shell-input",
         "ms-python.flake8",
         "nvidia.nsight-vscode-edition"
-      ]
+      ],
+      "files.watcherExclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/target/**": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      },
+      "search.exclude": {
+        "**/build/**": true,
+        "**/_skbuild/**": true,
+        "**/*.code-search": true,
+        "/home/coder/.aws/**/*": true,
+        "/home/coder/.cache/**/*": true,
+        "/home/coder/.conda/**/*": true,
+        "/home/coder/.local/share/**/*": true,
+        "/home/coder/.vscode-server/**/*": true
+      }
     }
   }
 }

From 706eb9a494eeea55decf56c7bfd4d79a8fdda5c2 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 20 Feb 2024 14:21:11 -0800
Subject: [PATCH 146/217] pass --quiet to silence git clone progress,
 --single-branch and --shallow-submodules

---
 .github/workflows/build-all-rapids-repos.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml
index 06cc28f38..b767f8a25 100644
--- a/.github/workflows/build-all-rapids-repos.yml
+++ b/.github/workflows/build-all-rapids-repos.yml
@@ -37,9 +37,7 @@ jobs:
       build_command: |
         sccache -z;
         sccache --show-adv-stats;
-        clone-all --verbose --clone-upstream --no-update-env;
-        rapids-generate-scripts;
-        rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
+        clone-all --verbose --quiet --clone-upstream --single-branch --shallow-submodules;
         build-all \
           --verbose \
           -j$(nproc --ignore=1) \

From a57991bea635431b91a9f10d23d0adb8e3194755 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 20 Feb 2024 14:36:26 -0800
Subject: [PATCH 147/217] don't make an env from an empty file

---
 .../opt/rapids-build-utils/bin/make-conda-env.sh                | 2 +-
 .../opt/rapids-build-utils/bin/make-pip-env.sh                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 14d6e61e0..d9095168d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -37,7 +37,7 @@ make_conda_env() {
 
     rapids-make-conda-dependencies "${OPTS[@]}" > "${new_env_path}";
 
-    if test -f "${new_env_path}"; then
+    if test -f "${new_env_path}" && test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -gt 0; then
 
         # If the conda env doesn't exist, make one
         if ! conda info -e | grep -qE "^${env_name} "; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 629a4fed4..8c1f6f7fb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -45,7 +45,7 @@ make_pip_env() {
 
     rapids-make-pip-dependencies "${OPTS[@]}" > "${new_env_path}";
 
-    if test -f "${new_env_path}"; then
+    if test -f "${new_env_path}" && test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -gt 0; then
 
         # If the venv doesn't exist, make one
         if [ ! -d "${HOME}/.local/share/venvs/${env_name}" ]; then

From 3dda16896da4472323d8b6a1aa019dc7573a30fe Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 21:16:38 +0000
Subject: [PATCH 148/217] only pass in the name of a cloned repo to
 generate_all_script

---
 .../opt/rapids-build-utils/bin/generate-scripts.sh         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index a920179bd..48233f1bf 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -170,6 +170,7 @@ generate_scripts() {
     local k;
 
     local repo_names=();
+    local cloned_repos=();
     local -r bin_dir="$(rapids-get-cmake-build-dir --skip-build-type)";
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
@@ -187,6 +188,10 @@ generate_scripts() {
         repo_name="${!repo_name,,}";
         repo_names+=("${repo_name}");
 
+        if [[ -d ~/"${!repo_path:-}/.git" ]]; then
+            cloned_repos+=("${repo_name}");
+        fi
+
         local deps=();
         local cpp_libs=();
         local cpp_dirs=();
@@ -307,7 +312,7 @@ generate_scripts() {
     if ((${#repo_names[@]} > 0)); then
         for script in "clone" "clean" "configure" "build" "cpack" "install" "uninstall"; do
             # Generate a script to run a script for all repos
-            NAME="${repo_names[0]}"    \
+            NAME="${cloned_repos[0]}"  \
             NAMES="${repo_names[*]@Q}" \
             SCRIPT="${script}"         \
             generate_all_script        ;

From d3deba615d0b88111e8463548dfc8fb790e33418 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 21:20:49 +0000
Subject: [PATCH 149/217] fix unbound variable error

---
 .../opt/rapids-build-utils/bin/generate-scripts.sh        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 48233f1bf..9ef2474f9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -312,10 +312,10 @@ generate_scripts() {
     if ((${#repo_names[@]} > 0)); then
         for script in "clone" "clean" "configure" "build" "cpack" "install" "uninstall"; do
             # Generate a script to run a script for all repos
-            NAME="${cloned_repos[0]}"  \
-            NAMES="${repo_names[*]@Q}" \
-            SCRIPT="${script}"         \
-            generate_all_script        ;
+            NAME="${cloned_repos[0]:-${repo_names[0]:-}}" \
+            NAMES="${repo_names[*]@Q}"  \
+            SCRIPT="${script}"          \
+            generate_all_script         ;
         done;
     fi
 }

From 1caf0aab47de02f812dadcc9ac928590da6e11a9 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 22:40:55 +0000
Subject: [PATCH 150/217] clean up manifest.yaml and python build script
 templates

---
 .../bin/tmpl/python.build.editable.tmpl.sh    |  17 +--
 .../bin/tmpl/python.build.wheel.tmpl.sh       |  15 ++-
 .../opt/rapids-build-utils/manifest.yaml      | 112 ++++++++----------
 3 files changed, 67 insertions(+), 77 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index a4eb0536c..bdafc0d42 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -20,7 +20,10 @@ build_${PY_LIB}_python_editable() {
 
     eval "$(_parse_args "$@" <&0)";
 
-    if [[ ! -d "${PY_SRC}" ]]; then
+    local py_lib="${PY_LIB}";
+    local py_src="${PY_SRC}";
+
+    if [[ ! -d "${py_src}" ]]; then
         exit 1;
     fi
 
@@ -63,20 +66,18 @@ build_${PY_LIB}_python_editable() {
         $(rapids-select-pip-wheel-args "${ARGS[@]}")
     )";
 
-    if rapids-python-uses-scikit-build-core "${PY_SRC}"; then
-        pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${PY_SRC}" "${cmake_args[@]}")");
-    else
-        export SETUPTOOLS_ENABLE_FEATURES="legacy-editable";
+    if rapids-python-uses-scikit-build-core "${py_src}"; then
+        pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${py_src}" "${cmake_args[@]}")");
     fi
 
     pip_args+=("--no-build-isolation");
     pip_args+=("--no-deps");
     pip_args+=("--editable");
-    pip_args+=("${PY_SRC}");
+    pip_args+=("${py_src}");
 
     cmake_args+=("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON");
 
-    trap "rm -rf '${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
+    trap "rm -rf '${py_src}/${py_lib//"-"/"_"}.egg-info'" EXIT;
 
     time (
         export ${PY_ENV} PATH="$PATH";
@@ -92,7 +93,7 @@ build_${PY_LIB}_python_editable() {
         NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
             python -m pip install "${pip_args[@]}"   \
         ;
-        { set +x; } 2>/dev/null; echo -n "${PY_LIB} install time:";
+        { set +x; } 2>/dev/null; echo -n "${py_lib} install time:";
     ) 2>&1;
 }
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 182749a39..680cf846d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -20,7 +20,10 @@ build_${PY_LIB}_python_wheel() {
 
     eval "$(_parse_args "$@" <&0)";
 
-    if [[ ! -d "${PY_SRC}" ]]; then
+    local py_lib="${PY_LIB}";
+    local py_src="${PY_SRC}";
+
+    if [[ ! -d "${py_src}" ]]; then
         exit 1;
     fi
 
@@ -67,15 +70,15 @@ build_${PY_LIB}_python_wheel() {
 
     case "${no_build_isolation:-$(pip config get wheel.no-build-isolation 2>/dev/null || echo)}" in
         True|true|yes|1)
-            if rapids-python-uses-scikit-build-core "${PY_SRC}"; then
-                pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${PY_SRC}" "${cmake_args[@]}")");
+            if rapids-python-uses-scikit-build-core "${py_src}"; then
+                pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${py_src}" "${cmake_args[@]}")");
             fi
             ;;
     esac
 
-    pip_args+=("${PY_SRC}");
+    pip_args+=("${py_src}");
 
-    trap "rm -rf '${PY_SRC}/$(echo "${PY_LIB}" | tr '-' '_').egg-info'" EXIT;
+    trap "rm -rf '${py_src}/${py_lib//"-"/"_"}.egg-info'" EXIT;
 
     time (
         export ${PY_ENV} PATH="$PATH";
@@ -91,7 +94,7 @@ build_${PY_LIB}_python_wheel() {
         NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
             python -m pip wheel "${pip_args[@]}" \
         ;
-        { set +x; } 2>/dev/null; echo -n "${PY_LIB} wheel build time:";
+        { set +x; } 2>/dev/null; echo -n "${py_lib} wheel build time:";
     ) 2>&1;
 }
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index 79a38cc43..5c5346751 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -3,82 +3,77 @@ x-git-defaults: &git_defaults
     tag: branch-24.04
     upstream: rapidsai
 
+x-python-wheel-no-build-isolation: &python_wheel_no_build_isolation
+  args:
+    wheel: --no-build-isolation
+
 repos:
 
 - name: rmm
   path: rmm
+  git: {<<: *git_defaults, repo: rmm}
   cpp:
     - name: rmm
       sub_dir: ""
-      depends: []
   python:
     - name: rmm
       sub_dir: python
-      depends: []
-  git:
-    repo: rmm
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
 
 - name: ucxx
   path: ucxx
-  git:
-    repo: ucxx
-    <<: *git_defaults
-    tag: branch-0.37
+  git: {<<: *git_defaults, repo: ucxx, tag: branch-0.37}
   cpp:
     - name: ucxx
-      sub_dir: "cpp"
+      sub_dir: cpp
       depends: [rmm]
       args: |
         -DUCXX_ENABLE_PYTHON=ON
         -DUCXX_ENABLE_RMM=ON
   python:
     - name: ucxx
-      sub_dir: "python"
-      depends: [rmm]
+      sub_dir: python
+      <<: *python_wheel_no_build_isolation
 
 - name: kvikio
   path: kvikio
+  git: {<<: *git_defaults, repo: kvikio}
   cpp:
     - name: KvikIO
       sub_dir: cpp
-      depends: []
+      depends: [rmm]
   python:
     - name: kvikio
       sub_dir: python
-      depends: []
-  git:
-    repo: kvikio
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
 
 - name: cudf
   path: cudf
+  git: {<<: *git_defaults, repo: cudf}
   cpp:
     - name: cudf
       sub_dir: cpp
       depends: [rmm, KvikIO]
     - name: cudf_kafka
       sub_dir: cpp/libcudf_kafka
-      depends: [KvikIO, cudf]
+      depends: [rmm, KvikIO, cudf]
   python:
     - name: cudf
       sub_dir: python/cudf
-      depends: [rmm]
+      <<: *python_wheel_no_build_isolation
     - name: dask_cudf
       sub_dir: python/dask_cudf
-      depends: [cudf]
+      <<: *python_wheel_no_build_isolation
     - name: cudf_kafka
       sub_dir: python/cudf_kafka
-      depends: [cudf]
+      <<: *python_wheel_no_build_isolation
     - name: custreamz
       sub_dir: python/custreamz
-      depends: [cudf, cudf_kafka]
-  git:
-    repo: cudf
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
 
 - name: raft
   path: raft
+  git: {<<: *git_defaults, repo: raft}
   cpp:
     - name: raft
       sub_dir: cpp
@@ -86,26 +81,22 @@ repos:
   python:
     - name: pylibraft
       sub_dir: python/pylibraft
-      depends: [rmm]
+      <<: *python_wheel_no_build_isolation
     - name: raft-dask
       sub_dir: python/raft-dask
-      depends: [pylibraft]
-  git:
-    repo: raft
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
 
 - name: cumlprims_mg
   path: cumlprims_mg
+  git: {<<: *git_defaults, repo: cumlprims_mg}
   cpp:
     - name: cumlprims_mg
       sub_dir: cpp
       depends: [rmm, raft]
-  git:
-    repo: cumlprims_mg
-    <<: *git_defaults
 
 - name: cuml
   path: cuml
+  git: {<<: *git_defaults, repo: cuml}
   cpp:
     - name: cuml
       sub_dir: cpp
@@ -113,13 +104,11 @@ repos:
   python:
     - name: cuml
       sub_dir: python
-      depends: [rmm, cudf, dask-cudf, pylibraft, raft-dask]
-  git:
-    repo: cuml
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
 
 - name: cugraph-ops
   path: cugraph-ops
+  git: {<<: *git_defaults, repo: cugraph-ops}
   cpp:
     - name: cugraph-ops
       sub_dir: cpp
@@ -130,16 +119,18 @@ repos:
   python:
     - name: pylibcugraphops
       sub_dir: pylibcugraphops
-      depends: []
+      <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: pylibcugraphops_internal
       sub_dir: pylibcugraphops_internal
-      depends: [pylibcugraphops]
-  git:
-    repo: cugraph-ops
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: wholegraph
   path: wholegraph
+  git: {<<: *git_defaults, repo: wholegraph}
   cpp:
     - name: wholegraph
       sub_dir: cpp
@@ -147,51 +138,49 @@ repos:
   python:
     - name: wholegraph
       sub_dir: python/pylibwholegraph
-      depends: [rmm, raft]
-  git:
-    repo: wholegraph
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: cugraph
   path: cugraph
+  git: {<<: *git_defaults, repo: cugraph}
   cpp:
     - name: cugraph
       sub_dir: cpp
       depends: [rmm, raft, cugraph-ops]
     - name: cugraph_etl
       sub_dir: cpp/libcugraph_etl
-      depends: [cugraph, cudf]
+      depends: [rmm, raft, cudf, cugraph-ops, cugraph]
   python:
     - name: pylibcugraph
       sub_dir: python/pylibcugraph
-      depends: [rmm, pylibraft]
+      <<: *python_wheel_no_build_isolation
     - name: cugraph
       sub_dir: python/cugraph
-      depends: [pylibraft, pylibcugraph]
+      <<: *python_wheel_no_build_isolation
     - name: nx-cugraph
       sub_dir: python/nx-cugraph
-      depends: [pylibcugraph]
+      <<: *python_wheel_no_build_isolation
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
-      depends: [cugraph]
+      <<: *python_wheel_no_build_isolation
     - name: cugraph-equivariant
       sub_dir: python/cugraph-equivariant
-      depends: [cugraph]
+      <<: *python_wheel_no_build_isolation
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
-      depends: [cugraph]
+      <<: *python_wheel_no_build_isolation
     - name: cugraph-service-client
       sub_dir: python/cugraph-service/client
-      depends: []
+      <<: *python_wheel_no_build_isolation
     - name: cugraph-service-server
       sub_dir: python/cugraph-service/server
-      depends: [cudf, dask-cudf, cugraph, cugraph-service-client]
-  git:
-    repo: cugraph
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation
 
 - name: cuspatial
   path: cuspatial
+  git: {<<: *git_defaults, repo: cuspatial}
   cpp:
     - name: cuspatial
       sub_dir: cpp
@@ -199,10 +188,7 @@ repos:
   python:
     - name: cuproj
       sub_dir: python/cuproj
-      depends: [rmm]
+      <<: *python_wheel_no_build_isolation
     - name: cuspatial
       sub_dir: python/cuspatial
-      depends: [rmm, cudf]
-  git:
-    repo: cuspatial
-    <<: *git_defaults
+      <<: *python_wheel_no_build_isolation

From f0e1acd939a0b5b9677e333bda20d1dec5d55f2d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 22:43:13 +0000
Subject: [PATCH 151/217] set no_build_isolation=true if defined in
 manifest.yaml

---
 .../rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 680cf846d..f4dbada4d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -68,6 +68,10 @@ build_${PY_LIB}_python_wheel() {
         $(rapids-select-pip-wheel-args "${ARGS[@]}")
     )";
 
+    if [[ " ${pip_args_[*]} " == *" --no-build-isolation "* ]]; then
+        no_build_isolation=true;
+    fi
+
     case "${no_build_isolation:-$(pip config get wheel.no-build-isolation 2>/dev/null || echo)}" in
         True|true|yes|1)
             if rapids-python-uses-scikit-build-core "${py_src}"; then

From e3f07f19c50d4ac36091da9225970911048f7db7 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 22:44:07 +0000
Subject: [PATCH 152/217] test pip_args instead of pip_args_

---
 .../opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index f4dbada4d..787850074 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -68,7 +68,7 @@ build_${PY_LIB}_python_wheel() {
         $(rapids-select-pip-wheel-args "${ARGS[@]}")
     )";
 
-    if [[ " ${pip_args_[*]} " == *" --no-build-isolation "* ]]; then
+    if [[ " ${pip_args[*]} " == *" --no-build-isolation "* ]]; then
         no_build_isolation=true;
     fi
 

From a7c02564a5887d2cb0948b9570c493d3dffb3b6f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:00:28 +0000
Subject: [PATCH 153/217] set SETUPTOOLS_ENABLE_FEATURES=legacy-editable for
 dask_cudf and custreamz

---
 .../rapids-build-utils/opt/rapids-build-utils/manifest.yaml   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index 5c5346751..743959598 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -64,12 +64,16 @@ repos:
     - name: dask_cudf
       sub_dir: python/dask_cudf
       <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cudf_kafka
       sub_dir: python/cudf_kafka
       <<: *python_wheel_no_build_isolation
     - name: custreamz
       sub_dir: python/custreamz
       <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: raft
   path: raft

From eca9380a4cfc44cc345e1cefe9ed78d0e72ebc5c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:42:45 +0000
Subject: [PATCH 154/217] do SETUPTOOLS_ENABLE_FEATURES=legacy-editable for
 more cugraph python projects

---
 .../opt/rapids-build-utils/manifest.yaml             | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index 743959598..5b93a1dcc 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -166,21 +166,33 @@ repos:
     - name: nx-cugraph
       sub_dir: python/nx-cugraph
       <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
       <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-equivariant
       sub_dir: python/cugraph-equivariant
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
       <<: *python_wheel_no_build_isolation
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
       <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-service-client
       sub_dir: python/cugraph-service/client
       <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-service-server
       sub_dir: python/cugraph-service/server
       <<: *python_wheel_no_build_isolation
+      env: |
+        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: cuspatial
   path: cuspatial

From a1862975daf761af315c7172074ccc4390b408ed Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:48:54 +0000
Subject: [PATCH 155/217] revert to always set legacy-editable if not using
 scikit-build-core

---
 .../bin/tmpl/python.build.editable.tmpl.sh    |  2 ++
 .../opt/rapids-build-utils/manifest.yaml      | 22 -------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index bdafc0d42..af23f4bf5 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -68,6 +68,8 @@ build_${PY_LIB}_python_editable() {
 
     if rapids-python-uses-scikit-build-core "${py_src}"; then
         pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${py_src}" "${cmake_args[@]}")");
+    else
+        export SETUPTOOLS_ENABLE_FEATURES=legacy-editable;
     fi
 
     pip_args+=("--no-build-isolation");
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index 5b93a1dcc..e486791ae 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -64,16 +64,12 @@ repos:
     - name: dask_cudf
       sub_dir: python/dask_cudf
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cudf_kafka
       sub_dir: python/cudf_kafka
       <<: *python_wheel_no_build_isolation
     - name: custreamz
       sub_dir: python/custreamz
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: raft
   path: raft
@@ -124,13 +120,9 @@ repos:
     - name: pylibcugraphops
       sub_dir: pylibcugraphops
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: pylibcugraphops_internal
       sub_dir: pylibcugraphops_internal
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: wholegraph
   path: wholegraph
@@ -143,8 +135,6 @@ repos:
     - name: wholegraph
       sub_dir: python/pylibwholegraph
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: cugraph
   path: cugraph
@@ -166,33 +156,21 @@ repos:
     - name: nx-cugraph
       sub_dir: python/nx-cugraph
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-equivariant
       sub_dir: python/cugraph-equivariant
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
       <<: *python_wheel_no_build_isolation
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-service-client
       sub_dir: python/cugraph-service/client
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
     - name: cugraph-service-server
       sub_dir: python/cugraph-service/server
       <<: *python_wheel_no_build_isolation
-      env: |
-        SETUPTOOLS_ENABLE_FEATURES=legacy-editable
 
 - name: cuspatial
   path: cuspatial

From d3c4bedfeb9e3236c3d182d288123a30b02488fe Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:23:18 -0800
Subject: [PATCH 156/217] allow making empty envs

---
 .../opt/rapids-build-utils/bin/make-conda-env.sh            | 6 +++++-
 .../opt/rapids-build-utils/bin/make-pip-env.sh              | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index d9095168d..58a3a2956 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -37,7 +37,11 @@ make_conda_env() {
 
     rapids-make-conda-dependencies "${OPTS[@]}" > "${new_env_path}";
 
-    if test -f "${new_env_path}" && test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -gt 0; then
+    if test -f "${new_env_path}"; then
+
+        if test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -eq 0; then
+            echo "name: ${env_name}" > "${new_env_path}";
+        fi
 
         # If the conda env doesn't exist, make one
         if ! conda info -e | grep -qE "^${env_name} "; then
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 8c1f6f7fb..629a4fed4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -45,7 +45,7 @@ make_pip_env() {
 
     rapids-make-pip-dependencies "${OPTS[@]}" > "${new_env_path}";
 
-    if test -f "${new_env_path}" && test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -gt 0; then
+    if test -f "${new_env_path}"; then
 
         # If the venv doesn't exist, make one
         if [ ! -d "${HOME}/.local/share/venvs/${env_name}" ]; then

From 579fe87a1ac6aafdd3aad2be31b219f171486605 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:35:04 -0800
Subject: [PATCH 157/217] pass -j in clone-all

---
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index b0f09f78e..9136601ff 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -23,7 +23,7 @@ clone_all() {
 
     eval "$(_parse_args --take '-j,--parallel --no-update-env' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load -a3 "$@")";
+    eval "$(rapids-get-num-archs-jobs-and-load -a3 "${ARGS[@]}")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all';

From 28460632474006a1a672559006f1b1c82039632e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:41:00 -0800
Subject: [PATCH 158/217] revert

---
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 9136601ff..b0f09f78e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -23,7 +23,7 @@ clone_all() {
 
     eval "$(_parse_args --take '-j,--parallel --no-update-env' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load -a3 "${ARGS[@]}")";
+    eval "$(rapids-get-num-archs-jobs-and-load -a3 "$@")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all';

From 73c6e36aa29334f43dcc308ef18ba1ab797df2d0 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:41:10 -0800
Subject: [PATCH 159/217] fix free mem calc

---
 .../opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index c75f049a2..d5490a2ec 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -78,7 +78,7 @@ get_num_archs_jobs_and_load() {
     # Clamp between 1 and ${max_archs} threads per nvcc job
     n_arch=$(( n_arch < 1 ? 1 : n_arch > max_archs ? max_archs : n_arch ));
 
-    local -r free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
+    local -r free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
     local -r freeswap=$(free --giga | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
     local all_cpus="${parallel}";
     local n_load="${all_cpus}";

From b4d1a2e8413297bf37f80ff2a1e0ec4d4c3e5dde Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 21 Feb 2024 23:50:42 -0800
Subject: [PATCH 160/217] use gibibytes (powers of 1024) instead of gigabytes

---
 .../opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index d5490a2ec..96eb40467 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -78,8 +78,8 @@ get_num_archs_jobs_and_load() {
     # Clamp between 1 and ${max_archs} threads per nvcc job
     n_arch=$(( n_arch < 1 ? 1 : n_arch > max_archs ? max_archs : n_arch ));
 
-    local -r free_mem=$(free --giga | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
-    local -r freeswap=$(free --giga | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
+    local -r free_mem=$(free --gibi | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
+    local -r freeswap=$(free --gibi | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
     local all_cpus="${parallel}";
     local n_load="${all_cpus}";
     # shellcheck disable=SC2155

From f2c664b8fb14e0e70ae75ce6cbba25d9aaa7d371 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 22 Feb 2024 00:13:17 -0800
Subject: [PATCH 161/217] recreate the env from scratch after cloning

---
 .github/workflows/build-all-rapids-repos.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml
index b767f8a25..782bf4d0a 100644
--- a/.github/workflows/build-all-rapids-repos.yml
+++ b/.github/workflows/build-all-rapids-repos.yml
@@ -37,7 +37,9 @@ jobs:
       build_command: |
         sccache -z;
         sccache --show-adv-stats;
-        clone-all --verbose --quiet --clone-upstream --single-branch --shallow-submodules;
+        clone-all --verbose --quiet --clone-upstream --single-branch --shallow-submodules --no-update-env;
+        rapids-make-${PYTHON_PACKAGE_MANAGER}-env -f;
+        rapids-generate-scripts;
         build-all \
           --verbose \
           -j$(nproc --ignore=1) \

From 245e3827ca7e997b30809c1e97c0a6527157d752 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 22 Feb 2024 00:59:28 -0800
Subject: [PATCH 162/217] source the rapids-make-{conda,pip}-env call

---
 .github/workflows/build-all-rapids-repos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml
index 782bf4d0a..fdb85568b 100644
--- a/.github/workflows/build-all-rapids-repos.yml
+++ b/.github/workflows/build-all-rapids-repos.yml
@@ -38,7 +38,7 @@ jobs:
         sccache -z;
         sccache --show-adv-stats;
         clone-all --verbose --quiet --clone-upstream --single-branch --shallow-submodules --no-update-env;
-        rapids-make-${PYTHON_PACKAGE_MANAGER}-env -f;
+        . rapids-make-${PYTHON_PACKAGE_MANAGER}-env -f;
         rapids-generate-scripts;
         build-all \
           --verbose \

From da9af1e5e838c783b06e4efc3980b7909c162e30 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 22 Feb 2024 01:14:28 -0800
Subject: [PATCH 163/217] revert recent changes

---
 .github/workflows/build-all-rapids-repos.yml                | 4 +---
 .../opt/rapids-build-utils/bin/make-conda-env.sh            | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml
index fdb85568b..b767f8a25 100644
--- a/.github/workflows/build-all-rapids-repos.yml
+++ b/.github/workflows/build-all-rapids-repos.yml
@@ -37,9 +37,7 @@ jobs:
       build_command: |
         sccache -z;
         sccache --show-adv-stats;
-        clone-all --verbose --quiet --clone-upstream --single-branch --shallow-submodules --no-update-env;
-        . rapids-make-${PYTHON_PACKAGE_MANAGER}-env -f;
-        rapids-generate-scripts;
+        clone-all --verbose --quiet --clone-upstream --single-branch --shallow-submodules;
         build-all \
           --verbose \
           -j$(nproc --ignore=1) \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index 58a3a2956..d9095168d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -37,11 +37,7 @@ make_conda_env() {
 
     rapids-make-conda-dependencies "${OPTS[@]}" > "${new_env_path}";
 
-    if test -f "${new_env_path}"; then
-
-        if test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -eq 0; then
-            echo "name: ${env_name}" > "${new_env_path}";
-        fi
+    if test -f "${new_env_path}" && test "$(wc -l "${new_env_path}" | cut -d' ' -f1)" -gt 0; then
 
         # If the conda env doesn't exist, make one
         if ! conda info -e | grep -qE "^${env_name} "; then

From 8134bd4f083a11479f6c746e0304bebeeed50a5d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 22 Feb 2024 19:04:01 +0000
Subject: [PATCH 164/217] add --max-archs envvar default, remove short arg for
 --archs and --max-device-obj-memory-usage, count archs better

---
 .../opt/rapids-build-utils/bin/checkout-same-branch.sh   | 6 +++---
 .../bin/get-num-archs-jobs-and-load.sh                   | 9 ++++-----
 .../opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh    | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh    | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh    | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index fe91ae0e3..399fecf91 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -23,9 +23,9 @@ checkout_same_branch() {
 
     eval "$(_parse_args "$@" <&0)";
 
-    eval "$(                                        \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}      \
-        rapids-get-num-archs-jobs-and-load -a1 "$@" \
+    eval "$(                                              \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}            \
+        rapids-get-num-archs-jobs-and-load --archs 1 "$@" \
     )";
 
     eval "$(rapids-list-repos "$@")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 96eb40467..44b8904c3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -13,12 +13,12 @@
 #  -h,--help                              Print this text.
 #
 # Options that require values:
-#  -a,--archs <num>                       Build <num> CUDA archs in parallel
+#  --archs <num>                          Build <num> CUDA archs in parallel
 #                                         (default: 1)
 #  --max-archs <num>                      Build at most <num> CUDA archs in parallel
 #                                         (default: 3)
 #  -j,--parallel <num>                    Run <num> parallel compilation jobs
-#  -m,--max-device-obj-memory-usage <num> An upper-bound on the amount of memory each CUDA device object compilation
+#  --max-device-obj-memory-usage <num>    An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
 #                                         limit.
@@ -41,8 +41,8 @@ get_num_archs_jobs_and_load() {
         j=$(nproc);
     fi
 
-    max_archs="${max_archs:-3}";
     parallel="${j:-${JOBS:-${PARALLEL_LEVEL:-1}}}";
+    max_archs="${max_archs:-${MAX_DEVICE_OBJ_TO_COMPILE_IN_PARALLEL:-3}}";
     max_device_obj_memory_usage="${m:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-1}}";
 
     local n_arch=${archs:-1};
@@ -69,8 +69,7 @@ get_num_archs_jobs_and_load() {
                 ;;
             *)
                 # Otherwise if explicitly defined, count the number of archs in the list
-                n_arch="$(echo "${archs}" | grep -o ';' | wc -l)";
-                n_arch="$(((n_arch + 1) / 2))";
+                n_arch="$(tr ';' ' ' <<< "${archs} " | tr -s '[:blank:]' | grep -o ' ' | wc -l)";
                 ;;
         esac
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index 3f867cd2a..84eab6f95 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -23,7 +23,7 @@ clean_all() {
 
     eval "$(_parse_args --take '-j,--parallel' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load -a1 "$@")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs 1 "$@")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all';
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index b0f09f78e..d9ae4a41a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -23,7 +23,7 @@ clone_all() {
 
     eval "$(_parse_args --take '-j,--parallel --no-update-env' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load -a3 "$@")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs 3 "$@")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all';
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index 808868fbd..d4cb0b5b9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -32,7 +32,7 @@ cpack_all() {
     local -r n_repos=$(echo ${NAMES} | wc -w);
     local k=$((n_repos / j));
 
-    eval "$(rapids-get-num-archs-jobs-and-load -j "${j}" -a "${k}" --max-archs "${k}")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs "${k}" --parallel "${j}" --max-archs "${k}")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all';

From 917f3cbf47d891632c33eb85840c8c71f0de8579 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 22 Feb 2024 19:23:37 +0000
Subject: [PATCH 165/217] only proxy ssh_auth_sock if it's not already proxied

---
 features/src/utils/opt/devcontainer/bin/post-create-command.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/src/utils/opt/devcontainer/bin/post-create-command.sh b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
index 03041f118..6a2d5d4b6 100755
--- a/features/src/utils/opt/devcontainer/bin/post-create-command.sh
+++ b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
@@ -10,6 +10,7 @@ fi
 # If SSH_AUTH_SOCK exists and isn't owned by the coder user, use socat to proxy
 # between a socket owned by the coder user and the one mounted in from the host
 if test -n "${SSH_AUTH_SOCK}" \
+&& test "${SSH_AUTH_SOCK}" != ~/.ssh/socket \
 && test "$(stat -c "%u:%g" "${SSH_AUTH_SOCK}")" != "$(id -u):$(id -g)"; then
     # shellcheck disable=SC1091
     . "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/update-envvars.sh";

From 4759c361b7f58219dfce2b6a78d6d65fe420b311 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 22 Feb 2024 19:24:32 +0000
Subject: [PATCH 166/217] guard against -u

---
 features/src/utils/opt/devcontainer/bin/post-create-command.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/utils/opt/devcontainer/bin/post-create-command.sh b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
index 6a2d5d4b6..c96fc7a1e 100755
--- a/features/src/utils/opt/devcontainer/bin/post-create-command.sh
+++ b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
@@ -9,7 +9,7 @@ fi
 
 # If SSH_AUTH_SOCK exists and isn't owned by the coder user, use socat to proxy
 # between a socket owned by the coder user and the one mounted in from the host
-if test -n "${SSH_AUTH_SOCK}" \
+if test -n "${SSH_AUTH_SOCK:-}" \
 && test "${SSH_AUTH_SOCK}" != ~/.ssh/socket \
 && test "$(stat -c "%u:%g" "${SSH_AUTH_SOCK}")" != "$(id -u):$(id -g)"; then
     # shellcheck disable=SC1091

From 8fbe5048015a362377640b74204226ecb5d4f8db Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:31:49 -0800
Subject: [PATCH 167/217] remove reference to old -m flag

---
 .../opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 44b8904c3..5b2f2c442 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -43,7 +43,7 @@ get_num_archs_jobs_and_load() {
 
     parallel="${j:-${JOBS:-${PARALLEL_LEVEL:-1}}}";
     max_archs="${max_archs:-${MAX_DEVICE_OBJ_TO_COMPILE_IN_PARALLEL:-3}}";
-    max_device_obj_memory_usage="${m:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-1}}";
+    max_device_obj_memory_usage="${max_device_obj_memory_usage:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-1}}";
 
     local n_arch=${archs:-1};
 

From f5864d252f5ab3425962e80b0ad28dc5cc7b512a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:33:25 -0800
Subject: [PATCH 168/217] Make generated scripts inherit `-D<repo>_ROOT=` CMake
 args from their dependencies, clean up manifest.yaml

---
 .../bin/generate-scripts.sh                   | 192 +++++++++++-------
 .../opt/rapids-build-utils/manifest.yaml      |  87 ++++----
 2 files changed, 166 insertions(+), 113 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 9ef2474f9..42f6b84ad 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -46,7 +46,7 @@ generate_script() {
     if test -n "${bin}"; then
         (
             cat - \
-          | envsubst '$HOME $NAME $SRC_PATH $PY_ENV $PY_SRC $PY_LIB $BIN_DIR $CPP_LIB $CPP_SRC $CPP_ARGS $CPP_DEPS $GIT_TAG $GIT_REPO $GIT_HOST $GIT_UPSTREAM $PY_CMAKE_ARGS $PIP_WHEEL_ARGS $PIP_INSTALL_ARGS' \
+          | envsubst '$HOME $NAME $SRC_PATH $PY_ENV $PY_SRC $PY_LIB $BIN_DIR $CPP_LIB $CPP_SRC $CPP_CMAKE_ARGS $CPP_CPACK_ARGS $CPP_DEPS $GIT_TAG $GIT_REPO $GIT_HOST $GIT_UPSTREAM $PIP_WHEEL_ARGS $PIP_INSTALL_ARGS' \
           | tee "${TMP_SCRIPT_DIR}/${bin}" >/dev/null;
 
             chmod +x "${TMP_SCRIPT_DIR}/${bin}";
@@ -129,7 +129,7 @@ generate_cpp_scripts() {
 
 generate_python_scripts() {
     local script_name;
-    for script_name in "build" "clean" "uninstall"; do
+    for script_name in "build" "clean" "install" "uninstall"; do
         if test -f "${TEMPLATES}/python.${script_name}.tmpl.sh"; then (
             # shellcheck disable=SC2002
             cat "${TEMPLATES}/python.${script_name}.tmpl.sh" \
@@ -163,27 +163,67 @@ generate_scripts() {
         . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'generate-scripts';
     fi
 
-    local -A cpp_name_to_path;
-
     local i;
     local j;
     local k;
 
-    local repo_names=();
-    local cloned_repos=();
+    local repo;
+    local repo_name;
+    local repo_path;
+    local cpp_length;
+    local py_length;
+    local git_repo;
+    local git_host;
+    local git_tag;
+    local git_upstream;
+
+    local cpp_name;
+    local cpp_path;
+    local cpp_sub_dir;
+    local cpp_cmake_args;
+    local cpp_cpack_args;
+    local cpp_depends_length;
+
+    local py_env;
+    local py_path;
+    local py_name;
+    local py_cmake_args;
+    local pip_wheel_args;
+    local pip_install_args;
+    local py_sub_dir;
+    local py_depends_length;
+
+    local dep;
+    local dep_name;
+    local dep_path;
+
+    local -A cpp_name_to_path;
+    local -A cpp_name_to_deps;
+
+    local -a py_libs=()
+    local -a py_dirs=()
+    local -a cpp_libs=();
+    local -a cpp_dirs=();
+    local -a cpp_deps=();
+
+    local -a repo_names=();
+    local -a cloned_repos=();
+    local -a immediate_cpp_deps=();
+    local -a inherited_cpp_deps=();
+
     local -r bin_dir="$(rapids-get-cmake-build-dir --skip-build-type)";
 
     for ((i=0; i < ${repos_length:-0}; i+=1)); do
 
-        local repo="repos_${i}";
-        local repo_name="${repo}_name";
-        local repo_path="${repo}_path";
-        local cpp_length="${repo}_cpp_length";
-        local py_length="${repo}_python_length";
-        local git_repo="${repo}_git_repo";
-        local git_host="${repo}_git_host";
-        local git_tag="${repo}_git_tag";
-        local git_upstream="${repo}_git_upstream";
+        repo="repos_${i}";
+        repo_name="${repo}_name";
+        repo_path="${repo}_path";
+        cpp_length="${repo}_cpp_length";
+        py_length="${repo}_python_length";
+        git_repo="${repo}_git_repo";
+        git_host="${repo}_git_host";
+        git_tag="${repo}_git_tag";
+        git_upstream="${repo}_git_upstream";
 
         repo_name="${!repo_name,,}";
         repo_names+=("${repo_name}");
@@ -192,20 +232,19 @@ generate_scripts() {
             cloned_repos+=("${repo_name}");
         fi
 
-        local deps=();
-        local cpp_libs=();
-        local cpp_dirs=();
-
-        local py_libs=()
-        local py_dirs=()
+        py_libs=()
+        py_dirs=()
+        cpp_libs=();
+        cpp_dirs=();
 
         for ((j=0; j < ${!cpp_length:-0}; j+=1)); do
 
-            local cpp_name="${repo}_cpp_${j}_name";
-            local cpp_args="${repo}_cpp_${j}_args";
-            local cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
-            local cpp_depends_length="${repo}_cpp_${j}_depends_length";
-            local cpp_path=~/"${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
+            cpp_name="${repo}_cpp_${j}_name";
+            cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
+            cpp_cmake_args="${repo}_cpp_${j}_args_cmake";
+            cpp_cpack_args="${repo}_cpp_${j}_args_cpack";
+            cpp_depends_length="${repo}_cpp_${j}_depends_length";
+            cpp_path=~/"${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
 
             cpp_dirs+=("${cpp_path}");
             cpp_libs+=("${!cpp_name:-}");
@@ -213,59 +252,67 @@ generate_scripts() {
 
             cpp_name_to_path["${cpp_name}"]="${cpp_path}";
 
-            local cpp_deps=();
+            immediate_cpp_deps=();
+            inherited_cpp_deps=();
 
             for ((k=0; k < ${!cpp_depends_length:-0}; k+=1)); do
-                local dep="${repo}_cpp_${j}_depends_${k}";
-                local dep_cpp_name="${!dep}";
-                if ! test -v cpp_name_to_path["${dep_cpp_name}"]; then
-                    continue;
+                dep="${repo}_cpp_${j}_depends_${k}";
+                dep_name="${!dep}";
+                if test -v cpp_name_to_path["${dep_name}"]; then
+                    dep_path="${cpp_name_to_path["${dep_name}"]}";
+                    immediate_cpp_deps+=("-D${dep_name}_ROOT=${dep_path}/${bin_dir}");
+                    if test -v cpp_name_to_deps["${dep_name}"]; then
+                        eval "inherited_cpp_deps+=(${cpp_name_to_deps["${dep_name}"]});"
+                    fi
                 fi
-                local dep_cpp_path="${cpp_name_to_path["${dep_cpp_name}"]}";
-
-                cpp_deps+=("-D${!dep}_ROOT=\"${dep_cpp_path}/${bin_dir}\"");
-                cpp_deps+=("-D${!dep,,}_ROOT=\"${dep_cpp_path}/${bin_dir}\"");
-                cpp_deps+=("-D${!dep^^}_ROOT=\"${dep_cpp_path}/${bin_dir}\"");
-                deps+=("${cpp_deps[@]}");
             done
 
+            # shellcheck disable=SC2206
+            cpp_deps=(${inherited_cpp_deps[@]@Q} ${immediate_cpp_deps[@]@Q});
+
+            cpp_name_to_deps["${cpp_name}"]="${cpp_deps[*]}";
+
             if [[ -d ~/"${!repo_path:-}/.git" ]]; then
-                NAME="${repo_name:-}"        \
-                SRC_PATH=~/"${!repo_path:-}" \
-                BIN_DIR="${bin_dir}"         \
-                CPP_LIB="${cpp_name:-}"      \
-                CPP_SRC="${!cpp_sub_dir:-}"  \
-                CPP_ARGS="${!cpp_args:-}"    \
-                CPP_DEPS="${cpp_deps[*]}"    \
-                generate_cpp_scripts         ;
+                NAME="${repo_name:-}"                 \
+                SRC_PATH=~/"${!repo_path:-}"          \
+                BIN_DIR="${bin_dir}"                  \
+                CPP_LIB="${cpp_name:-}"               \
+                CPP_SRC="${!cpp_sub_dir:-}"           \
+                CPP_DEPS="${cpp_deps[*]}"             \
+                CPP_CMAKE_ARGS="${!cpp_cmake_args:-}" \
+                CPP_CPACK_ARGS="${!cpp_cpack_args:-}" \
+                generate_cpp_scripts                  ;
             fi
         done
 
-        local args=();
-
-        for ((k=0; k < ${#cpp_libs[@]}; k+=1)); do
-            # Define both lowercase and uppercase
-            # `-DFIND_<lib>_CPP=ON` and `-DFIND_<LIB>_CPP=ON` because the RAPIDS
-            # scikit-build CMakeLists.txt's aren't 100% consistent in the casing
-            local cpp_dir="${cpp_dirs[$k]}";
-            local cpp_lib="${cpp_libs[$k]}";
-            args+=("-DFIND_${cpp_lib}_CPP=ON");
-            args+=("-DFIND_${cpp_lib,,}_CPP=ON");
-            args+=("-DFIND_${cpp_lib^^}_CPP=ON");
-            deps+=("-D${cpp_lib}_ROOT=\"${cpp_dir}/${bin_dir}\"");
-            deps+=("-D${cpp_lib,,}_ROOT=\"${cpp_dir}/${bin_dir}\"");
-            deps+=("-D${cpp_lib^^}_ROOT=\"${cpp_dir}/${bin_dir}\"");
-        done
-
         for ((j=0; j < ${!py_length:-0}; j+=1)); do
-            local py_env="${repo}_python_${j}_env";
-            local py_name="${repo}_python_${j}_name";
-            local py_cmake_args="${repo}_python_${j}_args_cmake";
-            local pip_wheel_args="${repo}_python_${j}_args_wheel";
-            local pip_install_args="${repo}_python_${j}_args_install";
-            local py_sub_dir="${repo}_python_${j}_sub_dir";
-            # local py_depends_length="${repo}_python_${j}_depends_length";
-            local py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
+            py_env="${repo}_python_${j}_env";
+            py_name="${repo}_python_${j}_name";
+            py_cmake_args="${repo}_python_${j}_args_cmake";
+            pip_wheel_args="${repo}_python_${j}_args_wheel";
+            pip_install_args="${repo}_python_${j}_args_install";
+            py_sub_dir="${repo}_python_${j}_sub_dir";
+            py_depends_length="${repo}_python_${j}_depends_length";
+            py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
+
+            immediate_cpp_deps=();
+            inherited_cpp_deps=();
+
+            for ((k=0; k < ${!py_depends_length:-0}; k+=1)); do
+                dep="${repo}_python_${j}_depends_${k}";
+                dep_name="${!dep}";
+                if test -v cpp_name_to_path["${dep_name}"]; then
+                    dep_path="${cpp_name_to_path["${dep_name}"]}";
+                    immediate_cpp_deps+=("-D${dep_name}_ROOT=${dep_path}/${bin_dir}");
+                    if test -v cpp_name_to_deps["${dep_name}"]; then
+                        # shellcheck disable=SC2206
+                        eval "inherited_cpp_deps+=(${cpp_name_to_deps["${dep_name}"]});"
+                    fi
+                fi
+            done
+
+            # shellcheck disable=SC2206
+            cpp_deps=(${inherited_cpp_deps[@]@Q} ${immediate_cpp_deps[@]@Q});
 
             py_dirs+=("${py_path}");
             py_libs+=("${!py_name}");
@@ -277,9 +324,8 @@ generate_scripts() {
                 PY_SRC="${py_path}"                       \
                 PY_LIB="${!py_name}"                      \
                 PY_ENV="${!py_env:-}"                     \
-                CPP_ARGS="${args[*]}"                     \
-                CPP_DEPS="${deps[*]}"                     \
-                PY_CMAKE_ARGS="${!py_cmake_args:-}"       \
+                CPP_DEPS="${cpp_deps[*]}"                 \
+                CPP_CMAKE_ARGS="${!py_cmake_args:-}"      \
                 PIP_WHEEL_ARGS="${!pip_wheel_args:-}"     \
                 PIP_INSTALL_ARGS="${!pip_install_args:-}" \
                 generate_python_scripts                   ;
@@ -324,7 +370,7 @@ _generate() {
     local -;
     set -euo pipefail;
 
-    echo "Generating RAPIDS build scripts in ${ALT_SCRIPT_DIR}";
+    echo "Generating RAPIDS build scripts in ${ALT_SCRIPT_DIR}" >&2;
 
     mkdir -p "${TMP_SCRIPT_DIR}";
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index e486791ae..effe4436b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -3,10 +3,6 @@ x-git-defaults: &git_defaults
     tag: branch-24.04
     upstream: rapidsai
 
-x-python-wheel-no-build-isolation: &python_wheel_no_build_isolation
-  args:
-    wheel: --no-build-isolation
-
 repos:
 
 - name: rmm
@@ -18,7 +14,8 @@ repos:
   python:
     - name: rmm
       sub_dir: python
-      <<: *python_wheel_no_build_isolation
+      depends: [rmm]
+      args: {cmake: -DFIND_RMM_CPP=ON}
 
 - name: ucxx
   path: ucxx
@@ -27,13 +24,15 @@ repos:
     - name: ucxx
       sub_dir: cpp
       depends: [rmm]
-      args: |
-        -DUCXX_ENABLE_PYTHON=ON
-        -DUCXX_ENABLE_RMM=ON
+      args:
+        cmake: |
+          -DUCXX_ENABLE_PYTHON=ON
+          -DUCXX_ENABLE_RMM=ON
   python:
     - name: ucxx
       sub_dir: python
-      <<: *python_wheel_no_build_isolation
+      depends: [ucxx]
+      args: {cmake: -DFIND_UCXX_CPP=ON}
 
 - name: kvikio
   path: kvikio
@@ -45,7 +44,8 @@ repos:
   python:
     - name: kvikio
       sub_dir: python
-      <<: *python_wheel_no_build_isolation
+      depends: [KvikIO]
+      args: {cmake: -DFIND_KVIKIO_CPP=ON}
 
 - name: cudf
   path: cudf
@@ -53,23 +53,22 @@ repos:
   cpp:
     - name: cudf
       sub_dir: cpp
-      depends: [rmm, KvikIO]
+      depends: [KvikIO]
     - name: cudf_kafka
       sub_dir: cpp/libcudf_kafka
-      depends: [rmm, KvikIO, cudf]
+      depends: [cudf]
   python:
     - name: cudf
       sub_dir: python/cudf
-      <<: *python_wheel_no_build_isolation
+      depends: [cudf]
+      args: {cmake: -DFIND_CUDF_CPP=ON}
     - name: dask_cudf
       sub_dir: python/dask_cudf
-      <<: *python_wheel_no_build_isolation
     - name: cudf_kafka
       sub_dir: python/cudf_kafka
-      <<: *python_wheel_no_build_isolation
+      depends: [cudf_kafka]
     - name: custreamz
       sub_dir: python/custreamz
-      <<: *python_wheel_no_build_isolation
 
 - name: raft
   path: raft
@@ -81,10 +80,12 @@ repos:
   python:
     - name: pylibraft
       sub_dir: python/pylibraft
-      <<: *python_wheel_no_build_isolation
+      depends: [raft]
+      args: {cmake: -DFIND_RAFT_CPP=ON}
     - name: raft-dask
       sub_dir: python/raft-dask
-      <<: *python_wheel_no_build_isolation
+      depends: [raft]
+      args: {cmake: -DFIND_RAFT_CPP=ON}
 
 - name: cumlprims_mg
   path: cumlprims_mg
@@ -92,7 +93,7 @@ repos:
   cpp:
     - name: cumlprims_mg
       sub_dir: cpp
-      depends: [rmm, raft]
+      depends: [raft]
 
 - name: cuml
   path: cuml
@@ -100,11 +101,12 @@ repos:
   cpp:
     - name: cuml
       sub_dir: cpp
-      depends: [rmm, raft, cumlprims_mg]
+      depends: [cumlprims_mg]
   python:
     - name: cuml
       sub_dir: python
-      <<: *python_wheel_no_build_isolation
+      depends: [cuml]
+      args: {cmake: -DFIND_CUML_CPP=ON}
 
 - name: cugraph-ops
   path: cugraph-ops
@@ -112,17 +114,17 @@ repos:
   cpp:
     - name: cugraph-ops
       sub_dir: cpp
-      depends: [rmm, raft]
+      depends: [raft]
     - name: cugraph-ops-internal
       sub_dir: cpp_internal
-      depends: [rmm, raft, cugraph-ops]
+      depends: [cugraph-ops]
   python:
     - name: pylibcugraphops
       sub_dir: pylibcugraphops
-      <<: *python_wheel_no_build_isolation
+      depends: [cugraph-ops]
     - name: pylibcugraphops_internal
       sub_dir: pylibcugraphops_internal
-      <<: *python_wheel_no_build_isolation
+      depends: [cugraph-ops-internal]
 
 - name: wholegraph
   path: wholegraph
@@ -130,11 +132,11 @@ repos:
   cpp:
     - name: wholegraph
       sub_dir: cpp
-      depends: [rmm, raft]
+      depends: [raft]
   python:
     - name: wholegraph
       sub_dir: python/pylibwholegraph
-      <<: *python_wheel_no_build_isolation
+      depends: [wholegraph]
 
 - name: cugraph
   path: cugraph
@@ -142,35 +144,31 @@ repos:
   cpp:
     - name: cugraph
       sub_dir: cpp
-      depends: [rmm, raft, cugraph-ops]
+      depends: [cugraph-ops]
     - name: cugraph_etl
       sub_dir: cpp/libcugraph_etl
-      depends: [rmm, raft, cudf, cugraph-ops, cugraph]
+      depends: [cudf, cugraph]
   python:
     - name: pylibcugraph
       sub_dir: python/pylibcugraph
-      <<: *python_wheel_no_build_isolation
+      depends: [cugraph]
+      args: {cmake: -DFIND_CUGRAPH_CPP=ON}
     - name: cugraph
       sub_dir: python/cugraph
-      <<: *python_wheel_no_build_isolation
+      depends: [cugraph]
+      args: {cmake: -DFIND_CUGRAPH_CPP=ON}
     - name: nx-cugraph
       sub_dir: python/nx-cugraph
-      <<: *python_wheel_no_build_isolation
     - name: cugraph-dgl
       sub_dir: python/cugraph-dgl
-      <<: *python_wheel_no_build_isolation
     - name: cugraph-equivariant
       sub_dir: python/cugraph-equivariant
-      <<: *python_wheel_no_build_isolation
     - name: cugraph_pyg
       sub_dir: python/cugraph-pyg
-      <<: *python_wheel_no_build_isolation
     - name: cugraph-service-client
       sub_dir: python/cugraph-service/client
-      <<: *python_wheel_no_build_isolation
     - name: cugraph-service-server
       sub_dir: python/cugraph-service/server
-      <<: *python_wheel_no_build_isolation
 
 - name: cuspatial
   path: cuspatial
@@ -178,11 +176,20 @@ repos:
   cpp:
     - name: cuspatial
       sub_dir: cpp
-      depends: [rmm, cudf]
+      depends: [cudf]
   python:
     - name: cuproj
       sub_dir: python/cuproj
-      <<: *python_wheel_no_build_isolation
+      depends: [rmm]
+      # cuproj is only built by cuspatial's CMake via add_subdirectory(cuproj),
+      # it doesn't have a build dir of its own. That means we can't list it as
+      # a cpp repo after cuspatial (above), and we have to manually point CMake
+      # to the cuspatial build dir here.
+      args:
+        cmake: |
+          -DFIND_CUPROJ_CPP=ON
+          -Dcuproj_ROOT="${HOME}/cuspatial/cpp/build/${PYTHON_PACKAGE_MANAGER}/cuda-${CUDA_VERSION}/latest"
     - name: cuspatial
       sub_dir: python/cuspatial
-      <<: *python_wheel_no_build_isolation
+      depends: [cuspatial]
+      args: {cmake: -DFIND_CUSPATIAL_CPP=ON}

From 32e7d2e36191f959bfdda9fd98b871c2200beb53 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:35:25 -0800
Subject: [PATCH 169/217] cleanup rapids-get-build-dir docstring

---
 .../rapids-build-utils/bin/get-cmake-build-dir.sh    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
index 0662076ea..5b8675c65 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Usage:
-#  rapids-get-cmake-build-dir [OPTIONS] [--] <source_path> [cmake_args]...
+#  rapids-get-cmake-build-dir [OPTIONS] [-DCMAKE_BUILD_TYPE=(Release|Debug)] [--] <source_path>...
 #
 # Build a path to the build directory for a C++ or scikit-build-core Python library.
 # If the <source_path> is not null and a valid directory, retarget the `build/(pip|conda)/cuda-X.Y.Z/latest` symlink
@@ -16,13 +16,12 @@
 # meaning they don't need to do a clean build if switching between devcontainers or build types.
 #
 # Boolean options:
-#  -h,--help          Print this text.
-#  --skip-build-type  Don't update the symlink pointing to the last component of
-#                     the build dir path, i.e. "latest -> (debug|release)".
+#  -h,--help                           Print this text.
+#  --skip-build-type                   Don't update the symlink pointing to the last component of
+#                                      the build dir path, i.e. "latest -> (debug|release)".
 #
 # Positional arguments:
-# source_path      The C++ or Python project source path
-# [cmake_args]...  The list of CMake arguments to search for the CMAKE_BUILD_TYPE
+# source_path                          The C++ or Python project source path
 
 # shellcheck disable=SC1091
 . rapids-generate-docstring;
@@ -66,7 +65,6 @@ get_cmake_build_dir() {
     else
         echo "${src:+${src}/}${bin}/${type}";
     fi
-    # echo "$(realpath -m "${src:+${src}/}${bin}/${type}")";
 }
 
 get_cmake_build_dir "$@" <&0;

From df3315b201d6f093a971a9e5d7608138e934a1d7 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:37:15 -0800
Subject: [PATCH 170/217] Parse and quote value options that have spaces

---
 .../devcontainer/bin/bash/completion.tmpl.sh  | 15 +++---
 .../bin/parse-args-from-docstring.sh          | 48 +++++++++++--------
 .../utils/opt/devcontainer/bin/parse-args.sh  |  7 +--
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
index 5b1ac6cde..c09d4240b 100755
--- a/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
+++ b/features/src/utils/opt/devcontainer/bin/bash/completion.tmpl.sh
@@ -70,10 +70,10 @@ _devcontainer_utils_completions() {
             local -a pair;
             read -a pair -r <<< "${name_and_type}";
             local name_="${pair[0]}";
-            local type_="${pair[1]}";
+            local type_="${pair[*]:1}";
             if [[ ${name_} == "${prev}" ]]; then
                 case "${type_}" in
-                    "<num>"|"<number>")
+                    "<num>"|"<number>"|"<sec>"|"<retries>")
                         # shellcheck disable=SC2207
                         COMPREPLY=($(grep -P "^[0-9]+$" <<< "${cur}"));
                         return;
@@ -82,19 +82,22 @@ _devcontainer_utils_completions() {
                         _filedir -d;
                         return;
                         ;;
-                    "<file>"|"<path>")
+                    "<file>"|"<path>"|"<path/url>")
                         _filedir;
                         return;
                         ;;
                     \(*\))
-                        local -a list=();
                         IFS=$'|' read -a list -r <<< "${type_:1:-1}";
                         if test ${#cur} -eq 0; then
                             COMPREPLY=("${list[@]}");
                         else
                             for item in "${list[@]}"; do
-                                if [[ ${item} =~ ^${cur} ]]; then
-                                    COMPREPLY+=("${item}");
+                                if [[ "${item}" =~ ^${cur} ]]; then
+                                    if [[ "${item}" == *" "* ]]; then
+                                        COMPREPLY+=("${item@Q}");
+                                    else
+                                        COMPREPLY+=("${item}");
+                                    fi
                                 fi
                             done
                         fi
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
index 06d7ebf98..643f9b870 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args-from-docstring.sh
@@ -18,9 +18,13 @@ _print_usage() {
 }
 
 _parse_args_to_names() {
-    cat -                           \
-  | sed -r 's/--?([^ ,]+)+/\1/g'    \
-  | sed -r 's/(,|\|)/ /g'           \
+    cat -                                              \
+    `# take the first char of short names i.e. -DFOO ` \
+  | sed -r 's/^-([a-zA-Z0-9]{1})[^ ,*].*/\1/g'         \
+    `# remove the leading --`                          \
+  | sed -r 's/--?([^ ,=]+)+/\1/g'                      \
+    `# translate ,| to spaces`                         \
+  | sed -r 's/(,|\|)/ /g'                              \
   ;
 }
 
@@ -34,25 +38,25 @@ _squeeze_spaces_in_options() {
 }
 
 _parse_all_names_from_usage() {
-    cat -                                    \
-  | _squeeze_spaces_in_options               \
-  | sed -rn 's/^[ ]*(--?[^ *]+)+[^*]*$/\1/p' \
-  | sed -r 's/(,|\|)/ /g'                    \
+    cat -                                  \
+  | _squeeze_spaces_in_options             \
+  | sed -rn 's/^[ ]*(--?[^ <(*]+).*$/\1/p' \
+  | sed -r 's/(,|\|)/ /g'                  \
   ;
 }
 
 _parse_value_names_from_usage() {
-    cat -                                                         \
-  | _squeeze_spaces_in_options                                    \
-  | sed -rn 's/^([ ]*)(--?[^ *]+|,|_)+[ ]*[<(](.[^)>]*).*$/\2/p'  \
-  | sed -r 's/(,|\|)/ /g'                                         \
+    cat -                                                     \
+  | _squeeze_spaces_in_options                                \
+  | sed -rn 's/^[ ]*(--?[^ <(*]+)+[ *]*[<(](.[^)>]*).*$/\1/p' \
+  | sed -r 's/(,|\|)/ /g'                                     \
   ;
 }
 
 _parse_value_types_from_usage() {
     cat -                      \
   | _squeeze_spaces_in_options \
-  | sed -rn 's/^[ ]*(--?[^ *]+|,|_)+[ ]*([<(].[^)>]*)([)>]).*$/\2\3/p';
+  | sed -rn -rn 's/^[ ]*(--?[^ <(*]+)+[ *]*([<(].[^)>]*)([)>]).*$/\2\3/p';
 }
 
 _parse_bool_names_from_usage() {
@@ -83,7 +87,7 @@ _listify() {
 _take_short_opts() {
     cat -                                   \
   `# skip the long opts`                    \
-  | sed -r 's/([ ]?--[^ ,]+)+,?//g'         \
+  | sed -r 's/([ ]?--[^ ,=]+)+,?//g'        \
   | _listify                                \
     ;
 }
@@ -94,19 +98,21 @@ _parse_short_names() {
   | _take_short_opts                        \
   `# remove the leading -`                  \
   | sed -r 's/-([^ ,*]+)+[,*]?/\1/g'        \
+  `# take the first character`              \
+  | sed -e 's/^\(.\{1\}\).*/\1/'            \
     ;
 }
 
 _parse_long_names() {
     # long opts are the complement of `all opts` \ `short opts`
-    tee >(_listify)              \
-        >(_take_short_opts)      \
-        1>/dev/null              \
-  | sort -s                      \
-  | uniq -u                      \
-  `# remove the leading --`      \
-  | sed -r 's/--?([^ ,]+)+/\1/g' \
-  | _listify                     \
+    tee >(_listify)               \
+        >(_take_short_opts)       \
+        1>/dev/null               \
+  | sort -s                       \
+  | uniq -u                       \
+  `# remove the leading --`       \
+  | sed -r 's/--?([^ ,=]+)+/\1/g' \
+  | _listify                      \
     ;
 }
 
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index dadc09d98..2ba7f381a 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -301,9 +301,6 @@ _parse_args_for_file() {
 
             # If the next arg is `--`, break so we handle it below instead of getopts eating it.
             if [[ "${!OPTIND:-}" == -- ]]; then
-                rest=("${@:$((OPTIND+1))}");
-                OPTIND=1;
-                set --;
                 break;
             fi
         done # end getopts loop
@@ -318,8 +315,8 @@ _parse_args_for_file() {
                 rest=("${@}");
                 set --;
             elif [[ "${val}" != -* ]]; then
-                rest+=("${val}");
-                shift;
+                rest=("${@}");
+                set --;
             else
                 break;
             fi

From 4ee097013feb2f849b1f160d15c213360a46b444 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:37:44 -0800
Subject: [PATCH 171/217] pass --archs 1 in repo clone template

---
 .../opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index d10d2e38a..bd1e6afa3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -31,7 +31,7 @@ clone_${NAME}() {
         -u,--upstream
     ' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load "$@")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs 1 "$@")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all clone-${NAME}';

From 08271c9cf9958ef3515fc52a89a9a2f37227cb7a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:38:56 -0800
Subject: [PATCH 172/217] don't error if dirs don't exist

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh         | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh         | 4 +---
 .../opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh      | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh  | 4 ----
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
index c7ab78c53..99bdf35a6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.clean.tmpl.sh
@@ -21,7 +21,7 @@ clean_${CPP_LIB}_cpp() {
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME} clean-${CPP_LIB}-cpp';
 
     if [[ ! -d "${CPP_SRC}" ]]; then
-        exit 1;
+        return;
     fi
 
     rm -rf -- \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index da9f69cc0..620e3b5ba 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -82,9 +82,7 @@ cpack_${CPP_LIB}_cpp() {
             fi
         fi
 
-        if test -z "${name:-}"; then
-            exit 1;
-        fi
+        name="${name:-${CPP_LIB}}";
 
         for comp in "${component[@]}"; do
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
index dcf7b6800..927098470 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.clean.tmpl.sh
@@ -21,7 +21,7 @@ clean_${PY_LIB}_python() {
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all clean-${NAME} clean-${PY_LIB}-python';
 
     if [[ ! -d "${PY_SRC}" ]]; then
-        exit 1;
+        return;
     fi
 
     local py_lib="${PY_LIB}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index 56f58350d..6c8bef0f0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -21,10 +21,6 @@ uninstall_${PY_LIB}_python() {
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME} uninstall-${PY_LIB}-python';
 
-    if [[ ! -d "${PY_SRC}" ]]; then
-        exit 1;
-    fi
-
     time (
         pip uninstall -y "${OPTS[@]}" "${PY_LIB}";
         { set +x; } 2>/dev/null; echo -n "${PY_LIB} uninstall time:";

From 7d558313667517128ae7238fbd475d6390bc31e4 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:40:51 -0800
Subject: [PATCH 173/217] pass --archs 1 in cpp.cpack template

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 620e3b5ba..29ee3b8bd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -33,9 +33,9 @@ cpack_${CPP_LIB}_cpp() {
         exit 0;
     fi
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
+    eval "$(                                              \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}            \
+        rapids-get-num-archs-jobs-and-load --archs 1 "$@" \
     )";
 
     # shellcheck disable=SC1091

From e367712bf569980a1a6c39651b51b59dedeb119c Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:41:16 -0800
Subject: [PATCH 174/217] handle pairs of --component and --out-dir

---
 .../bin/tmpl/cpp.cpack.tmpl.sh                | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 29ee3b8bd..75081b8b2 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -27,7 +27,7 @@ cpack_${CPP_LIB}_cpp() {
         -j,--parallel
         -o,--out-dir
         --component
-    ' "$@" <&0)";
+    ' "$@" ${CPP_CPACK_ARGS} <&0)";
 
     if ! test -f "${CPP_SRC}/${BIN_DIR}/CMakeCache.txt"; then
         exit 0;
@@ -41,12 +41,10 @@ cpack_${CPP_LIB}_cpp() {
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all cpack-${NAME} cpack-${CPP_LIB}-cpp';
 
-    out_dir="${o:+$(realpath -ms "${o}")}";
-
     ((${#component[@]})) || component=(all);
 
     time (
-        local comp;
+        local i;
         local name;
         local slug;
         local outd;
@@ -84,7 +82,9 @@ cpack_${CPP_LIB}_cpp() {
 
         name="${name:-${CPP_LIB}}";
 
-        for comp in "${component[@]}"; do
+        for ((i=0; i < ${#component[@]}; i+=1)); do
+
+            local comp="${component[$i]}";
 
             if test "all" = "${comp}";
                 then comp="";
@@ -93,15 +93,23 @@ cpack_${CPP_LIB}_cpp() {
             slug="${name}${vers:+-$vers}${comp:+-$comp}-${kernel}";
             outd="${CPP_SRC}/${BIN_DIR}/_CPack_Packages/${kernel}/TGZ";
 
-            install-${CPP_LIB}-cpp --prefix "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}";
+            install-${CPP_LIB}-cpp --prefix "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}" >/dev/null 2>&1;
 
             if test -d "${outd}/${slug}"; then
                 tar -C "${outd}" -c ${v:+-v} -f "${outd}/${slug}.tar.gz" -I "pigz -p ${n_jobs}" "${slug}";
                 cp -a "${outd}/${slug}.tar.gz" "${CPP_SRC}/${BIN_DIR}/";
-                if test -n "${out_dir}" \
-                && test -f "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz"; then
-                    mkdir -p "${out_dir}/";
-                    cp -a "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz" "${out_dir}/";
+
+                if test -z "${out_dir-}" || test "${#out_dir[@]}" -eq 0; then
+                    continue;
+                elif test "${i}" -lt "${#out_dir[@]}"; then
+                    outd="$(realpath -ms "${out_dir[$i]}")";
+                else
+                    outd="$(realpath -ms "${out_dir[${#out_dir[@]}-1]}")";
+                fi
+
+                if test -n "${outd:-}"; then
+                    mkdir -p "${outd}/";
+                    cp -a "${CPP_SRC}/${BIN_DIR}/${slug}.tar.gz" "${outd}/";
                 fi
             fi
         done

From d5c440bfc690c47a35b701e4ea67fe7a894f2a2f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:43:56 -0800
Subject: [PATCH 175/217] add rapids-maybe-clean-build-dir, don't
 unconditionally reconfigure in cpp.build template, support generators other
 than Ninja

---
 features/src/rapids-build-utils/install.sh    |  1 +
 .../bin/maybe-clean-build-dir.sh              | 40 +++++++++++++
 .../bin/tmpl/cpp.build.tmpl.sh                | 28 +++++----
 .../bin/tmpl/cpp.configure.tmpl.sh            | 40 ++++++-------
 .../bin/tmpl/python.build.wheel.tmpl.sh       | 57 ++++++++-----------
 5 files changed, 102 insertions(+), 64 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/maybe-clean-build-dir.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 142bde1b0..251e98b53 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -40,6 +40,7 @@ cp -ar ./opt/rapids-build-utils /opt/;
 
 declare -a commands=(
     checkout-same-branch
+    maybe-clean-build-dir
     generate-docstring
     generate-scripts
     get-cmake-build-dir
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/maybe-clean-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/maybe-clean-build-dir.sh
new file mode 100755
index 000000000..1cf6a39d9
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/maybe-clean-build-dir.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-maybe-clean-build-dir [OPTION]... [--] SRC_DIR
+#
+# Returns the path to the build directory for <SRC_DIR>.
+#
+# Optionally cleans the build directory if the configure step for the CMake generator failed.
+#
+# Boolean options:
+#  -h,--help                  Print this text.
+#
+# Options that require values:
+#  -G (Ninja|Unix Makefiles)  The build system generator.
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+maybe_clean_build_dir() {
+    local -;
+    set -euo pipefail;
+
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'maybe-clean-build-dir';
+
+    eval "$(_parse_args "$@" <&0)";
+
+    local -r bin_dir="$(rapids-get-cmake-build-dir "${OPTS[@]}" "${REST[@]}")";
+
+    case "${G:-Ninja}" in
+        "Unix Makefiles")
+            test -f "${bin_dir}/Makefile" || rm -rf "${bin_dir}";;
+        "Ninja")
+            test -f "${bin_dir}/build.ninja" || rm -rf "${bin_dir}";;
+    esac
+    echo "${bin_dir}";
+}
+
+
+maybe_clean_build_dir "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index ded4b00b0..ec51f2a1f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -5,7 +5,8 @@
 #
 # Configure and build ${CPP_LIB}.
 #
-# @_include_options /usr/bin/configure-${CPP_LIB}-cpp -h | tail -n+2;
+# @_include_bool_options /usr/bin/configure-${CPP_LIB}-cpp -h;
+# @_include_value_options /usr/bin/configure-${CPP_LIB}-cpp -h;
 # @_include_cmake_build_options
 
 # shellcheck disable=SC1091
@@ -15,31 +16,36 @@ build_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    eval "$(_parse_args --take '-j,--parallel' "$@" <&0)";
-
     eval "$(                                    \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
     )";
 
-    # shellcheck disable=SC1091
-    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${CPP_LIB}-cpp';
+    local -a cmake_args_="(${CMAKE_ARGS:-})";
+    cmake_args_+=(${CPP_CMAKE_ARGS});
+
+    eval "$(_parse_args --take '-G -j,--parallel' "$@" "${cmake_args_[@]}" <&0)";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
+        echo "build-${CPP_LIB}-cpp: cannot access '${CPP_SRC}': No such directory" >&2;
         exit 1;
     fi
 
-    configure-${CPP_LIB}-cpp ${j:+"-j${j}"} "${OPTS[@]}";
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${CPP_LIB}-cpp';
+
+    # Reconfigure if not configured or previous configure failed
+    local -r bin_dir="$(rapids-maybe-clean-build-dir "${G:-Ninja}" "$@" -- "${CPP_SRC}")";
+    test -d "${bin_dir:-${CPP_SRC}/${BIN_DIR}}" || configure-${CPP_LIB}-cpp "$@" <&0;
 
     # Build C++ lib
     time (
         local -a cmake_build_args="($(rapids-select-cmake-build-args ${n_jobs:+-j${n_jobs}} "${OPTS[@]}"))";
-
         cmake                               \
-        --build "${CPP_SRC}/${BIN_DIR}"     \
-        "${cmake_build_args[@]}"            \
-        --                                  \
-        ${n_load:+-l${n_load}}              ;
+            --build "${CPP_SRC}/${BIN_DIR}" \
+            "${cmake_build_args[@]}"        \
+            --                              \
+            ${n_load:+-l${n_load}}          ;
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} build time:";
     ) 2>&1;
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 75e71d33c..2ca3784bf 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -5,6 +5,10 @@
 #
 # Configure ${CPP_LIB}.
 #
+# Boolean options:
+#  -h,--help     Print this text.
+#  -v,--verbose  Verbose output.
+#
 # @_include_value_options rapids-get-num-archs-jobs-and-load -h;
 # @_include_cmake_options;
 
@@ -15,41 +19,37 @@ configure_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    eval "$(_parse_args "$@" <&0)";
-
-    if [[ ! -d "${CPP_SRC}" ]]; then
-        exit 1;
-    fi
-
     eval "$(                                    \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
         rapids-get-num-archs-jobs-and-load "$@" \
     )";
 
+    local -a cmake_args_="(${CMAKE_ARGS:-})";
+    cmake_args_+=(${CPP_CMAKE_ARGS});
+
+    eval "$(_parse_args --take '-G, -v,--verbose' "$@" "${cmake_args_[@]}" <&0)";
+
+    if [[ ! -d "${CPP_SRC}" ]]; then
+        echo "configure-${CPP_LIB}-cpp: cannot access '${CPP_SRC}': No such directory" >&2;
+        exit 1;
+    fi
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all configure-${NAME} configure-${CPP_LIB}-cpp';
 
-    local -a cmake_args_=(
-        -GNinja
-        ${CMAKE_ARGS:-}
+    local -a cmake_args="(
+        -G \"${G:-Ninja}\"
+        ${cmake_args_[*]@Q}
         ${CPP_DEPS}
-        ${CPP_ARGS}
         ${v:+--log-level=VERBOSE}
-    );
-    local -a cmake_args="(
-        ${cmake_args_+"${cmake_args_[*]@Q}"}
-        $(rapids-select-cmake-args "${ARGS[@]}")
+        $(rapids-select-cmake-args "$@")
     )";
 
-    local -r bin_dir="$(rapids-get-cmake-build-dir -- "${CPP_SRC}" "${cmake_args[@]}")";
-
     # Reconfigure if previous configure failed
-    if [[ ! -f "${bin_dir}/build.ninja" ]]; then
-        rm -rf "${bin_dir}";
-    fi
+    local -r bin_dir="$(rapids-maybe-clean-build-dir "${cmake_args[@]}" --  "${CPP_SRC}")";
 
     cmake_args+=(-S "${CPP_SRC}");
-    cmake_args+=(-B "${bin_dir}");
+    cmake_args+=(-B "${bin_dir:-${CPP_SRC}/${BIN_DIR}}");
 
     time (
         CUDAFLAGS="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}" \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 787850074..6efe7fb90 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -18,34 +18,34 @@ build_${PY_LIB}_python_wheel() {
     local -;
     set -euo pipefail;
 
-    eval "$(_parse_args "$@" <&0)";
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+    )";
 
     local py_lib="${PY_LIB}";
-    local py_src="${PY_SRC}";
 
-    if [[ ! -d "${py_src}" ]]; then
+    local -a cmake_args_="(${CMAKE_ARGS:-})";
+    cmake_args_+=(${CPP_CMAKE_ARGS});
+
+    local -a pip_args_=(${PIP_WHEEL_ARGS});
+
+    eval "$(_parse_args --take '-G -v,--verbose' "$@" "${cmake_args_[@]}" "${pip_args_[@]}" <&0)";
+
+    if [[ ! -d "${PY_SRC}" ]]; then
+        echo "build-${PY_LIB}-python-wheel: cannot access '${PY_SRC}': No such directory" >&2;
         exit 1;
     fi
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-wheel';
 
-    local -a cmake_args_=(
-        ${PY_CMAKE_ARGS}
-        ${CMAKE_ARGS:-}
+    local -a cmake_args="(
+        -G \"${G:-Ninja}\"
+        ${cmake_args_[*]@Q}
         ${CPP_DEPS}
-        ${CPP_ARGS}
         ${v:+--log-level=VERBOSE}
-    );
-
-    local -a cmake_args="(
-        ${cmake_args_+"${cmake_args_[*]@Q}"}
-        $(rapids-select-cmake-args "${ARGS[@]}")
+        $(rapids-select-cmake-args "$@")
     )";
 
     local ninja_args=();
@@ -62,27 +62,18 @@ build_${PY_LIB}_python_wheel() {
         ninja_args+=("-l${n_load}");
     fi
 
-    local -a pip_args_=(${PIP_WHEEL_ARGS});
     local -a pip_args="(
         ${pip_args_+"${pip_args_[*]@Q}"}
-        $(rapids-select-pip-wheel-args "${ARGS[@]}")
+        $(rapids-select-pip-wheel-args "$@")
     )";
 
-    if [[ " ${pip_args[*]} " == *" --no-build-isolation "* ]]; then
-        no_build_isolation=true;
+    if rapids-python-uses-scikit-build-core "${PY_SRC}"; then
+        pip_args+=(-C "build-dir=$(rapids-maybe-clean-build-dir "${cmake_args[@]}" -- "${PY_SRC}")");
     fi
 
-    case "${no_build_isolation:-$(pip config get wheel.no-build-isolation 2>/dev/null || echo)}" in
-        True|true|yes|1)
-            if rapids-python-uses-scikit-build-core "${py_src}"; then
-                pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${py_src}" "${cmake_args[@]}")");
-            fi
-            ;;
-    esac
-
-    pip_args+=("${py_src}");
+    pip_args+=("${PY_SRC}");
 
-    trap "rm -rf '${py_src}/${py_lib//"-"/"_"}.egg-info'" EXIT;
+    trap "rm -rf '${PY_SRC}/${py_lib//"-"/"_"}.egg-info'" EXIT;
 
     time (
         export ${PY_ENV} PATH="$PATH";
@@ -91,14 +82,14 @@ build_${PY_LIB}_python_wheel() {
         local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
 
         CUDAFLAGS="${cudaflags}"                 \
-        CMAKE_GENERATOR="Ninja"                  \
+        CMAKE_GENERATOR="${G:-Ninja}"            \
         PARALLEL_LEVEL="${n_jobs}"               \
         CMAKE_ARGS="${cmake_args[*]}"            \
         SKBUILD_BUILD_OPTIONS="${ninja_args[*]}" \
         NVCC_APPEND_FLAGS="${nvcc_append_flags}" \
             python -m pip wheel "${pip_args[@]}" \
         ;
-        { set +x; } 2>/dev/null; echo -n "${py_lib} wheel build time:";
+        { set +x; } 2>/dev/null; echo -n "${PY_LIB} wheel build time:";
     ) 2>&1;
 }
 

From 8b91c6ca12b6443577fe5adc02d27abb0c5f4235 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 12:44:22 -0800
Subject: [PATCH 176/217] Add python.install template, update
 python.build.editable template to call it with --editable flag

---
 .../bin/tmpl/python.build.editable.tmpl.sh    |  83 +------------
 .../bin/tmpl/python.install.tmpl.sh           | 113 ++++++++++++++++++
 2 files changed, 114 insertions(+), 82 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
index af23f4bf5..2171d4a95 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.editable.tmpl.sh
@@ -15,88 +15,7 @@
 . rapids-generate-docstring;
 
 build_${PY_LIB}_python_editable() {
-    local -;
-    set -euo pipefail;
-
-    eval "$(_parse_args "$@" <&0)";
-
-    local py_lib="${PY_LIB}";
-    local py_src="${PY_SRC}";
-
-    if [[ ! -d "${py_src}" ]]; then
-        exit 1;
-    fi
-
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
-    # shellcheck disable=SC1091
-    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-editable';
-
-    local -a cmake_args_=(
-        ${PY_CMAKE_ARGS}
-        ${CMAKE_ARGS:-}
-        ${CPP_DEPS}
-        ${CPP_ARGS}
-        ${v:+--log-level=VERBOSE}
-    );
-
-    local -a cmake_args="(
-        ${cmake_args_+"${cmake_args_[*]@Q}"}
-        $(rapids-select-cmake-args "${ARGS[@]}")
-    )";
-
-    if test -n "${v}"; then
-        ninja_args+=("-v");
-    fi
-
-    if test -n "${n_jobs}"; then
-        ninja_args+=("-j${n_jobs}");
-    fi
-
-    if test -n "${n_load}"; then
-        ninja_args+=("-l${n_load}");
-    fi
-
-    local -a pip_args_=(${PIP_INSTALL_ARGS});
-    local -a pip_args="(
-        ${pip_args_+"${pip_args_[*]@Q}"}
-        $(rapids-select-pip-wheel-args "${ARGS[@]}")
-    )";
-
-    if rapids-python-uses-scikit-build-core "${py_src}"; then
-        pip_args+=(-C "build-dir=$(rapids-get-cmake-build-dir -- "${py_src}" "${cmake_args[@]}")");
-    else
-        export SETUPTOOLS_ENABLE_FEATURES=legacy-editable;
-    fi
-
-    pip_args+=("--no-build-isolation");
-    pip_args+=("--no-deps");
-    pip_args+=("--editable");
-    pip_args+=("${py_src}");
-
-    cmake_args+=("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON");
-
-    trap "rm -rf '${py_src}/${py_lib//"-"/"_"}.egg-info'" EXIT;
-
-    time (
-        export ${PY_ENV} PATH="$PATH";
-
-        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
-        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
-
-        CUDAFLAGS="${cudaflags}"                     \
-        CMAKE_GENERATOR="Ninja"                      \
-        PARALLEL_LEVEL="${n_jobs}"                   \
-        CMAKE_ARGS="${cmake_args[*]}"                \
-        SKBUILD_BUILD_OPTIONS="${ninja_args[*]}"     \
-        NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
-            python -m pip install "${pip_args[@]}"   \
-        ;
-        { set +x; } 2>/dev/null; echo -n "${py_lib} install time:";
-    ) 2>&1;
+    install-${PY_LIB}-python --no-build-isolation --no-deps --editable "${PY_SRC}" "$@" <&0;
 }
 
 build_${PY_LIB}_python_editable "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
new file mode 100755
index 000000000..bb140fbbf
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  install-${PY_LIB}-python [OPTION]...
+#
+# Install ${PY_LIB}.
+#
+# @_include_value_options rapids-get-num-archs-jobs-and-load -h;
+# @_include_cmake_options;
+# @_include_pip_install_options;
+# @_include_pip_package_index_options;
+# @_include_pip_general_options;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+install_${PY_LIB}_python() {
+    local -;
+    set -euo pipefail;
+
+    eval "$(                                              \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}            \
+        rapids-get-num-archs-jobs-and-load --archs 1 "$@" \
+    )";
+
+    local py_lib="${PY_LIB}";
+
+    local -a cmake_args_="(${CMAKE_ARGS:-})";
+    cmake_args_+=(${CPP_CMAKE_ARGS});
+
+    local -a pip_args_=(${PIP_INSTALL_ARGS});
+
+    eval "$(_parse_args --take '-G -e,--editable -v,--verbose' "$@" "${cmake_args_[@]}" "${pip_args_[@]}" <&0)";
+
+    if [[ ! -d "${PY_SRC}" ]]; then
+        echo "install-${PY_LIB}-python: cannot access '${PY_SRC}': No such directory" >&2;
+        exit 1;
+    fi
+
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-editable install-all install-${NAME} install-${PY_LIB}-python';
+
+    local -a cmake_args="(
+        -G \"${G:-Ninja}\"
+        ${cmake_args_[*]@Q}
+        ${CPP_DEPS}
+        ${v:+--log-level=VERBOSE}
+        $(rapids-select-cmake-args "$@")
+    )";
+
+    if test -n "${v}"; then
+        ninja_args+=("-v");
+    fi
+
+    if test -n "${n_jobs}"; then
+        ninja_args+=("-j${n_jobs}");
+    fi
+
+    if test -n "${n_load}"; then
+        ninja_args+=("-l${n_load}");
+    fi
+
+    local -a pip_args="(
+        ${pip_args_+"${pip_args_[*]@Q}"}
+        $(rapids-select-pip-install-args "$@")
+    )";
+
+    if rapids-python-uses-scikit-build-core "${PY_SRC}"; then
+        pip_args+=(-C "build-dir=$(rapids-maybe-clean-build-dir "${cmake_args[@]}" -- "${PY_SRC}")");
+    elif test -n "${editable:-}"; then
+        export SETUPTOOLS_ENABLE_FEATURES=legacy-editable;
+        cmake_args+=("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON");
+    fi
+
+    # Put --editable at the end of pip_args
+    if test ${#editable[@]} -gt 0; then
+        local i;
+        local n=1;
+        test -n "${editable:-}" && n=2;
+        for ((i=0; i < ${#pip_args}; i+=1)); do
+            case "${pip_args[${i}]}" in
+                -e|--editable)
+                    pip_args=("${pip_args[@]:0:$i}" "${pip_args[@]:$((i + n))}");
+                    break;
+                    ;;
+            esac
+        done
+        pip_args+=(--editable "${editable:-${PY_SRC}}");
+    else
+        pip_args+=("${PY_SRC}");
+    fi
+
+    trap "rm -rf '${PY_SRC}/${py_lib//"-"/"_"}.egg-info'" EXIT;
+
+    time (
+        export ${PY_ENV} PATH="$PATH";
+
+        local cudaflags="${CUDAFLAGS:+$CUDAFLAGS }-t=${n_arch}";
+        local nvcc_append_flags="${NVCC_APPEND_FLAGS:+$NVCC_APPEND_FLAGS }-t=${n_arch}";
+
+        CUDAFLAGS="${cudaflags}"                     \
+        CMAKE_GENERATOR="${G:-Ninja}"                \
+        PARALLEL_LEVEL="${n_jobs}"                   \
+        CMAKE_ARGS="${cmake_args[*]}"                \
+        SKBUILD_BUILD_OPTIONS="${ninja_args[*]}"     \
+        NVCC_APPEND_FLAGS="${nvcc_append_flags}"     \
+            python -m pip install "${pip_args[@]}"   \
+        ;
+        { set +x; } 2>/dev/null; echo -n "${PY_LIB} install time:";
+    ) 2>&1;
+}
+
+install_${PY_LIB}_python "$@" <&0;

From b98e8a0f01690c801cccb7b7eb73d2872273290a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 13:38:40 -0800
Subject: [PATCH 177/217] only release features after images are pushed

---
 .github/workflows/release.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dce6e3736..10d71a971 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,11 +9,6 @@ on:
 
 jobs:
 
-  release-features:
-    name: Release Features
-    secrets: inherit
-    uses: ./.github/workflows/release-features.yml
-
   image-matrix:
     name: Determine image matrix
     runs-on: ubuntu-latest
@@ -62,3 +57,9 @@ jobs:
       features: "${{ toJSON(matrix.features) }}"
       container_env: "${{ toJSON(matrix.env) }}"
       repo: "${{ vars.DOCKERHUB_REPOSITORY || github.repository }}"
+
+  release-features:
+    needs: build-and-push-linux-images
+    name: Release Features
+    secrets: inherit
+    uses: ./.github/workflows/release-features.yml

From ff4a985423d5e32d69042b0af3c8f61b70b522d7 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 22:00:11 -0800
Subject: [PATCH 178/217] support ssh_url and https_url in manifest.yaml

---
 .../bin/generate-scripts.sh                   | 30 +++++++++++--------
 .../bin/tmpl/repo.clone.tmpl.sh               |  4 +++
 .../opt/devcontainer/bin/git/repo/clone.sh    |  2 +-
 .../opt/devcontainer/bin/github/repo/clone.sh | 10 ++++---
 .../opt/devcontainer/bin/gitlab/repo/clone.sh | 10 ++++---
 .../utils/opt/devcontainer/bin/parse-args.sh  |  6 ++--
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
index 42f6b84ad..ca6694260 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/generate-scripts.sh
@@ -46,7 +46,7 @@ generate_script() {
     if test -n "${bin}"; then
         (
             cat - \
-          | envsubst '$HOME $NAME $SRC_PATH $PY_ENV $PY_SRC $PY_LIB $BIN_DIR $CPP_LIB $CPP_SRC $CPP_CMAKE_ARGS $CPP_CPACK_ARGS $CPP_DEPS $GIT_TAG $GIT_REPO $GIT_HOST $GIT_UPSTREAM $PIP_WHEEL_ARGS $PIP_INSTALL_ARGS' \
+          | envsubst '$HOME $NAME $SRC_PATH $PY_ENV $PY_SRC $PY_LIB $BIN_DIR $CPP_LIB $CPP_SRC $CPP_CMAKE_ARGS $CPP_CPACK_ARGS $CPP_DEPS $GIT_TAG $GIT_SSH_URL $GIT_HTTPS_URL $GIT_REPO $GIT_HOST $GIT_UPSTREAM $PIP_WHEEL_ARGS $PIP_INSTALL_ARGS' \
           | tee "${TMP_SCRIPT_DIR}/${bin}" >/dev/null;
 
             chmod +x "${TMP_SCRIPT_DIR}/${bin}";
@@ -176,6 +176,8 @@ generate_scripts() {
     local git_host;
     local git_tag;
     local git_upstream;
+    local git_ssh_url;
+    local git_https_url;
 
     local cpp_name;
     local cpp_path;
@@ -224,6 +226,8 @@ generate_scripts() {
         git_host="${repo}_git_host";
         git_tag="${repo}_git_tag";
         git_upstream="${repo}_git_upstream";
+        git_ssh_url="${repo}_git_ssh_url";
+        git_https_url="${repo}_git_https_url";
 
         repo_name="${!repo_name,,}";
         repo_names+=("${repo_name}");
@@ -340,17 +344,19 @@ generate_scripts() {
         fi
 
         # Generate a clone script for each repo
-        NAME="${repo_name:-}"             \
-        SRC_PATH=~/"${!repo_path:-}"      \
-        PY_LIB="${py_libs[*]@Q}"          \
-        PY_SRC="${py_dirs[*]@Q}"          \
-        CPP_LIB="${cpp_libs[*]@Q}"        \
-        CPP_SRC="${cpp_dirs[*]@Q}"        \
-        GIT_TAG="${!git_tag:-}"           \
-        GIT_REPO="${!git_repo:-}"         \
-        GIT_HOST="${!git_host:-}"         \
-        GIT_UPSTREAM="${!git_upstream:-}" \
-        generate_clone_script             ;
+        NAME="${repo_name:-}"               \
+        SRC_PATH=~/"${!repo_path:-}"        \
+        PY_LIB="${py_libs[*]@Q}"            \
+        PY_SRC="${py_dirs[*]@Q}"            \
+        CPP_LIB="${cpp_libs[*]@Q}"          \
+        CPP_SRC="${cpp_dirs[*]@Q}"          \
+        GIT_TAG="${!git_tag:-}"             \
+        GIT_REPO="${!git_repo:-}"           \
+        GIT_HOST="${!git_host:-}"           \
+        GIT_UPSTREAM="${!git_upstream:-}"   \
+        GIT_SSH_URL="${!git_ssh_url:-}"     \
+        GIT_HTTPS_URL="${!git_https_url:-}" \
+        generate_clone_script               ;
     done
 
     unset cpp_name_to_path;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index bd1e6afa3..3983d08d8 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -42,6 +42,8 @@ clone_${NAME}() {
 
     branch="${b:-"${GIT_TAG}"}";
     directory="${d:-"${SRC_PATH}"}";
+    ssh_url="${ssh_url:-${GIT_SSH_URL}}";
+    https_url="${https_url:-${GIT_HTTPS_URL}}";
     upstream="${u:-"${GIT_UPSTREAM}/${GIT_REPO}"}";
 
     echo 'Cloning ${NAME}' 1>&2;
@@ -49,6 +51,8 @@ clone_${NAME}() {
     devcontainer-utils-clone-${GIT_HOST}-repo \
         --tags                                \
         --branch "${branch}"                  \
+        --ssh-url "${ssh_url}"                \
+        --https-url "${https_url}"            \
         --recurse-submodules                  \
         -j ${n_jobs:-$(nproc --ignore=1)}     \
         -c checkout.defaultRemote=upstream    \
diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index f9e490ee2..625c1d0eb 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -100,7 +100,7 @@ clone_git_repo() {
     fi
 
     # shellcheck disable=SC2086
-    git -C "${directory}" submodule update --init --recursive ${j} ${q};
+    git -C "${directory}" submodule update --recursive ${j} ${q};
 }
 
 clone_git_repo "$@" <&0;
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 652a06284..6d3d561df 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -20,6 +20,8 @@
 # Options that require values:
 #  -b,--branch <branch_or_tag>  Check the repo out to <branch_or_tag>.
 #  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel.
+#  --ssh-url <url>              FQDN of the GitHub instance when cloning via SSH.
+#  --https-url <url>            FQDN of the GitHub instance when cloning via HTTPS.
 #
 # Positional arguments:
 #  upstream                     Set <upstream> as the `upstream` remote.
@@ -157,11 +159,11 @@ clone_github_repo() {
 
     if test -z "${origin_:-}" || test -z "${upstream_:-}"; then
         if [ "$(gh config get git_protocol)" = "ssh" ]; then
-            origin_="${origin_:-"git@${GITHUB_HOST:-github.com}:${origin}.git"}";
-            upstream_="${upstream_:-"git@${GITHUB_HOST:-github.com}:${upstream}.git"}";
+            origin_="${origin_:-"ssh://git@${ssh_url:-${GITHUB_HOST:-github.com}}/${origin}.git"}";
+            upstream_="${upstream_:-"ssh://git@${ssh_url:-${GITHUB_HOST:-github.com}}/${upstream}.git"}";
         else
-            origin_="${origin_:-"https://${GITHUB_HOST:-github.com}/${origin}.git"}";
-            upstream_="${upstream_:-"https://${GITHUB_HOST:-github.com}/${upstream}.git"}";
+            origin_="${origin_:-"https://${https_url:-${GITHUB_HOST:-github.com}}/${origin}.git"}";
+            upstream_="${upstream_:-"https://${https_url:-${GITHUB_HOST:-github.com}}/${upstream}.git"}";
         fi
     fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 826276844..6baeee01f 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -20,6 +20,8 @@
 # Options that require values:
 #  -b,--branch <branch_or_tag>  Check the repo out to <branch_or_tag>.
 #  -j,--jobs,--parallel <num>   Clone <num> submodules in parallel
+#  --ssh-url <url>              FQDN of the GitLab instance when cloning via SSH.
+#  --https-url <url>            FQDN of the GitLab instance when cloning via HTTPS.
 #
 # Positional arguments:
 #  upstream                     Set <upstream> as the `upstream` remote.
@@ -182,11 +184,11 @@ clone_gitlab_repo() {
 
     if test -z "${origin_:-}" || test -z "${upstream_:-}"; then
         if [ "$(glab config get git_protocol)" = "ssh" ]; then
-            origin_="${origin_:-"git@${GITLAB_HOST:-gitlab.com}:${origin}.git"}";
-            upstream_="${upstream_:-"git@${GITLAB_HOST:-gitlab.com}:${upstream}.git"}";
+            origin_="${origin_:-"ssh://git@${ssh_url:-${GITLAB_HOST:-gitlab.com}}/${origin}.git"}";
+            upstream_="${upstream_:-"ssh://git@${ssh_url:-${GITLAB_HOST:-gitlab.com}}/${upstream}.git"}";
         else
-            origin_="${origin_:-"https://${GITLAB_HOST:-gitlab.com}/${origin}.git"}";
-            upstream_="${upstream_:-"https://${GITLAB_HOST:-gitlab.com}/${upstream}.git"}";
+            origin_="${origin_:-"https://${https_url:-${GITLAB_HOST:-gitlab.com}}/${origin}.git"}";
+            upstream_="${upstream_:-"https://${https_url:-${GITLAB_HOST:-gitlab.com}}/${upstream}.git"}";
         fi
     fi
 
diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 2ba7f381a..5316dc033 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -175,7 +175,7 @@ _parse_args_for_file() {
                         # Peek at the next argument.
                         # If it begins with `-`, leave it for getopts.
                         # Otherwise, push it onto the skipped list and splice it out of $@.
-                        if [[ "${!OPTIND:--}" != -* ]]; then
+                        if [[ ${OPTIND} -le ${#@} && "${!OPTIND:-}" != -* ]]; then
                             opts+=("${!OPTIND}");
                             # Splice the argument at index `OPTIND` out of $@
                             set -- "${@:1:$((OPTIND-1))}" "${@:$((OPTIND+1))}";
@@ -205,7 +205,7 @@ _parse_args_for_file() {
                             typ="value";
                             key="${OPTARG}";
                             arg+=("--${key}");
-                            if [[ "${!OPTIND:--}" != -* ]]; then
+                            if [[ ${OPTIND} -le ${#@} && "${!OPTIND:-}" != -* ]]; then
                                 val="${!OPTIND}";
                                 arg+=("${val}");
                                 OPTIND=$((OPTIND + 1));
@@ -230,7 +230,7 @@ _parse_args_for_file() {
                                 arg+=("--${key}");
                             else
                                 opts+=("--${OPTARG}");
-                                if [[ "${!OPTIND:--}" != -* ]]; then
+                                if [[ ${OPTIND} -le ${#@} && "${!OPTIND:-}" != -* ]]; then
                                     opts+=("${!OPTIND}");
                                     OPTIND=$((OPTIND + 1));
                                 fi

From 73fe0d6a5793b80e079c284fadd22995fe7a08b3 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 26 Feb 2024 22:00:52 -0800
Subject: [PATCH 179/217] only modify cupy-cuda and cuda-python if they're at
 the beginning of a line

---
 .../opt/rapids-build-utils/bin/make-pip-dependencies.sh       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index d664a123f..e46006793 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -112,8 +112,8 @@ make_pip_dependencies() {
       | ( if test -n "${no_dedupe:-}"; then cat -; else tr -s "[:blank:]" | LC_ALL=C sort -u; fi )              \
       | (grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ])  \
       | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                       \
-      | sed -E "s/cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                                           \
-      | sed -E "s/cuda-python.*/cuda-python>=${cuda_version}.0,<$((cuda_version_major+1)).0a0/g"                \
+      | sed -E "s/^cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                                          \
+      | sed -E "s/^cuda-python.*/cuda-python>=${cuda_version}.0,<$((cuda_version_major+1)).0a0/g"               \
         ;
 
         rm -f "${pip_reqs_txts[@]}";

From 9ff0585df1b4e6a387f56962376f78303b1f50df Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 00:42:08 -0800
Subject: [PATCH 180/217] Pass -DUSE_LIBARROW_FROM_PYARROW=ON to cuDF if
 PYTHON_PACKAGE_MANAGER is pip

---
 .github/workflows/build-all-rapids-repos.yml               | 7 +++----
 .../opt/rapids-build-utils/manifest.yaml                   | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-all-rapids-repos.yml b/.github/workflows/build-all-rapids-repos.yml
index b767f8a25..2bc2fd34b 100644
--- a/.github/workflows/build-all-rapids-repos.yml
+++ b/.github/workflows/build-all-rapids-repos.yml
@@ -37,15 +37,14 @@ jobs:
       build_command: |
         sccache -z;
         sccache --show-adv-stats;
-        clone-all --verbose --quiet --clone-upstream --single-branch --shallow-submodules;
+        clone-all -j$(nproc) -v -q --clone-upstream --single-branch --shallow-submodules;
         build-all \
-          --verbose \
+          -v \
           -j$(nproc --ignore=1) \
-          -DBUILD_SHARED_LIBS=ON \
           -DBUILD_TESTS=ON \
           -DBUILD_BENCHMARKS=ON \
           -DBUILD_ANN_BENCH=ON \
           -DBUILD_PRIMS_BENCH=ON \
-          $([ "pip" = ${PYTHON_PACKAGE_MANAGER} ] && echo -DUSE_LIBARROW_FROM_PYARROW=ON || echo) \
+          -DBUILD_SHARED_LIBS=ON \
           ;
         sccache --show-adv-stats;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index effe4436b..dd5b18a70 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -54,6 +54,9 @@ repos:
     - name: cudf
       sub_dir: cpp
       depends: [KvikIO]
+      args:
+        cmake: |
+          $([ "pip" = ${PYTHON_PACKAGE_MANAGER} ] && echo -DUSE_LIBARROW_FROM_PYARROW=ON || echo)
     - name: cudf_kafka
       sub_dir: cpp/libcudf_kafka
       depends: [cudf]

From 9bcebe8e3e1b08fbed48740df955b287eedd2dc3 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 00:42:24 -0800
Subject: [PATCH 181/217] pass CMAKE_CUDA_ARCHTECTURES to the projects that
 ignore the CUDAARCHS envvar

---
 .../opt/rapids-build-utils/manifest.yaml          | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
index dd5b18a70..957f3b197 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/manifest.yaml
@@ -118,16 +118,28 @@ repos:
     - name: cugraph-ops
       sub_dir: cpp
       depends: [raft]
+      args:
+        cmake: |
+          -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
     - name: cugraph-ops-internal
       sub_dir: cpp_internal
       depends: [cugraph-ops]
+      args:
+        cmake: |
+          -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
   python:
     - name: pylibcugraphops
       sub_dir: pylibcugraphops
       depends: [cugraph-ops]
+      args:
+        cmake: |
+          -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
     - name: pylibcugraphops_internal
       sub_dir: pylibcugraphops_internal
       depends: [cugraph-ops-internal]
+      args:
+        cmake: |
+          -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
 
 - name: wholegraph
   path: wholegraph
@@ -136,6 +148,9 @@ repos:
     - name: wholegraph
       sub_dir: cpp
       depends: [raft]
+      args:
+        cmake: |
+          -DCMAKE_CUDA_ARCHITECTURES="${CUDAARCHS}"
   python:
     - name: wholegraph
       sub_dir: python/pylibwholegraph

From b8cd7605d0d4c10a0d9da7b7c529571d024fbc04 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 01:23:20 -0800
Subject: [PATCH 182/217] define CPM_SOURCE_CACHE

---
 .devcontainer/rapids.Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/rapids.Dockerfile b/.devcontainer/rapids.Dockerfile
index 65025a677..7e2095194 100644
--- a/.devcontainer/rapids.Dockerfile
+++ b/.devcontainer/rapids.Dockerfile
@@ -50,4 +50,5 @@ ENV SCCACHE_BUCKET="rapids-sccache-devs"
 ENV VAULT_HOST="https://vault.ops.k8s.rapids.ai"
 ENV HISTFILE="/home/coder/.cache/._bash_history"
 
+ENV CPM_SOURCE_CACHE="/home/coder/.cache/cpm"
 ENV LIBCUDF_KERNEL_CACHE_PATH="/home/coder/cudf/cpp/build/latest/jitify_cache"

From e7086c9c8ba39ccb5b884e8b0e88ebfa1f0e19fb Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 01:30:32 -0800
Subject: [PATCH 183/217] set libcudf_kernel_cache_path to more specific build
 dir

---
 .devcontainer/rapids.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/rapids.Dockerfile b/.devcontainer/rapids.Dockerfile
index 7e2095194..970b88795 100644
--- a/.devcontainer/rapids.Dockerfile
+++ b/.devcontainer/rapids.Dockerfile
@@ -51,4 +51,4 @@ ENV VAULT_HOST="https://vault.ops.k8s.rapids.ai"
 ENV HISTFILE="/home/coder/.cache/._bash_history"
 
 ENV CPM_SOURCE_CACHE="/home/coder/.cache/cpm"
-ENV LIBCUDF_KERNEL_CACHE_PATH="/home/coder/cudf/cpp/build/latest/jitify_cache"
+ENV LIBCUDF_KERNEL_CACHE_PATH="/home/coder/cudf/cpp/build/${PYTHON_PACKAGE_MANAGER}/cuda-${CUDA_VERSION}/latest/jitify_cache"

From 83aa60de99952d8cc405dd87ad8030c5552bb318 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 14:34:07 -0800
Subject: [PATCH 184/217] add --max-total-system-memory option to limit total
 amount of system memory to consume for C++ and device compilations

---
 .../bin/get-num-archs-jobs-and-load.sh          | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 5b2f2c442..14b472410 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -13,11 +13,15 @@
 #  -h,--help                              Print this text.
 #
 # Options that require values:
-#  --archs <num>                          Build <num> CUDA archs in parallel
+#  --archs <num>                          Build <num> CUDA archs in parallel.
 #                                         (default: 1)
-#  --max-archs <num>                      Build at most <num> CUDA archs in parallel
+#  -j,--parallel <num>                    Run <num> parallel compilation jobs.
+#  --max-archs <num>                      Build at most <num> CUDA archs in parallel.
 #                                         (default: 3)
-#  -j,--parallel <num>                    Run <num> parallel compilation jobs
+#  --max-total-system-memory <num>        An upper-bound on the amount of total system memory (in GiB) to use during
+#                                         C++ and CUDA device compilations.
+#                                         Smaller values yield fewer parallel C++ and CUDA device compilations.
+#                                         (default: all available memory)
 #  --max-device-obj-memory-usage <num>    An upper-bound on the amount of memory each CUDA device object compilation
 #                                         is expected to take. This is used to estimate the number of parallel device
 #                                         object compilations that can be launched without hitting the system memory
@@ -77,15 +81,16 @@ get_num_archs_jobs_and_load() {
     # Clamp between 1 and ${max_archs} threads per nvcc job
     n_arch=$(( n_arch < 1 ? 1 : n_arch > max_archs ? max_archs : n_arch ));
 
-    local -r free_mem=$(free --gibi | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0');
-    local -r freeswap=$(free --gibi | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0');
+    local -r free_mem="$(free --gibi | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0')";
+    local -r freeswap="$(free --gibi | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0')";
+    local -r mem_total="${max_total_system_memory:-${MAX_TOTAL_SYSTEM_MEMORY:-$((free_mem + freeswap))}}";
     local all_cpus="${parallel}";
     local n_load="${all_cpus}";
     # shellcheck disable=SC2155
     local n_jobs="$(cat<<____EOF | bc
 scale=0
 max_cpu=(${all_cpus} / ${n_arch} / 2 * 3)
-max_mem=((${free_mem} + ${freeswap}) / ${n_arch} / ${max_device_obj_memory_usage})
+max_mem=(${mem_total} / ${n_arch} / ${max_device_obj_memory_usage})
 if(max_cpu < max_mem) max_cpu else max_mem
 ____EOF
     )";

From e8b174a7539ca9f626257964b41963f6f3e2bce3 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 15:53:57 -0800
Subject: [PATCH 185/217] make ~/.local/share dir owned by the non-root user

---
 features/src/utils/install.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 35d84161b..5804753db 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -139,13 +139,13 @@ for dir in $(for_each_user_bashrc 'echo "$(dirname "$(realpath -m "$0")")"'); do
     cp .gitconfig "${dir}"/.gitconfig.default;
     # Copy in default .bash_completion
     cp .bash_completion "${dir}"/.bash_completion;
-    mkdir -p -m 0755                                    \
-        `# Create ~/.cache, i.e. $XDG_CACHE_HOME`       \
-        "${dir}"/.cache                                 \
-        `# Create ~/.config, i.e. $XDG_CONFIG_HOME`     \
-        "${dir}"/.config "${dir}"/.config/{clangd,pip}  \
-        `# Create ~/.local/state, i.e. $XDG_STATE_HOME` \
-        "${dir}"/.local "${dir}"/.local/{bin,state}     \
+    mkdir -p -m 0755                                      \
+        `# Create ~/.cache, i.e. $XDG_CACHE_HOME`         \
+        "${dir}"/.cache                                   \
+        `# Create ~/.config, i.e. $XDG_CONFIG_HOME`       \
+        "${dir}"/.config "${dir}"/.config/{clangd,pip}    \
+        `# Create ~/.local/state, i.e. $XDG_STATE_HOME`   \
+        "${dir}"/.local "${dir}"/.local/{bin,state,share} \
     # Create or update ~/.ssh/known_hosts
     mkdir -p -m 0700 "${dir}"/.ssh;
     touch "${dir}"/.ssh/known_hosts;
@@ -156,7 +156,7 @@ ____EOF
 done
 
 rm -rf /root/.cache;
-rm -rf /root/.local/{bin,state};
+rm -rf /root/.local/{bin,state,share};
 rm -rf /root/.config/{clangd,pip};
 
 # Find the non-root user

From e646de8851827d77ac135596a576b8d415605bee Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 05:40:15 +0000
Subject: [PATCH 186/217] support --archs 0 to omit device object memory in
 n_jobs calculation

---
 .../bin/checkout-same-branch.sh               |  2 +-
 .../bin/get-num-archs-jobs-and-load.sh        | 35 ++++++++++++-------
 .../bin/tmpl/all.clean.tmpl.sh                |  2 +-
 .../bin/tmpl/all.clone.tmpl.sh                |  2 +-
 .../bin/tmpl/all.cpack.tmpl.sh                |  2 +-
 .../bin/tmpl/cpp.cpack.tmpl.sh                |  2 +-
 .../bin/tmpl/python.install.tmpl.sh           |  6 ++--
 .../bin/tmpl/repo.clone.tmpl.sh               |  2 +-
 8 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
index 399fecf91..0d35ea549 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/checkout-same-branch.sh
@@ -25,7 +25,7 @@ checkout_same_branch() {
 
     eval "$(                                              \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}            \
-        rapids-get-num-archs-jobs-and-load --archs 1 "$@" \
+        rapids-get-num-archs-jobs-and-load --archs 0 "$@" \
     )";
 
     eval "$(rapids-list-repos "$@")";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
index 14b472410..1dc7d70eb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-num-archs-jobs-and-load.sh
@@ -41,15 +41,17 @@ get_num_archs_jobs_and_load() {
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'get-num-archs-jobs-and-load';
 
+    local -r n_cpus="$(nproc)";
+
     if test ${#j[@]} -gt 0 && test -z "${j:-}"; then
-        j=$(nproc);
+        j="${n_cpus}";
     fi
 
     parallel="${j:-${JOBS:-${PARALLEL_LEVEL:-1}}}";
     max_archs="${max_archs:-${MAX_DEVICE_OBJ_TO_COMPILE_IN_PARALLEL:-3}}";
     max_device_obj_memory_usage="${max_device_obj_memory_usage:-${MAX_DEVICE_OBJ_MEMORY_USAGE:-1}}";
 
-    local n_arch=${archs:-1};
+    local n_arch=${archs:-0};
 
     if test -z "${archs:-}" \
     && test -n "${INFER_NUM_DEVICE_ARCHITECTURES:-}"; then
@@ -63,12 +65,12 @@ get_num_archs_jobs_and_load() {
                 n_arch=1;
                 ;;
             all | all-major)
-                # Max out at 3 threads per object
+                # Max out at ${max_archs} threads per job
                 n_arch=${max_archs};
                 ;;
             ALL | RAPIDS)
                 # currently: 60-real;70-real;75-real;80-real;86-real;90
-                # see: https://github.com/rapidsai/rapids-cmake/blob/branch-23.10/rapids-cmake/cuda/set_architectures.cmake#L54
+                # see: https://github.com/rapidsai/rapids-cmake/blob/branch-24.04/rapids-cmake/cuda/set_architectures.cmake#L54
                 n_arch=6;
                 ;;
             *)
@@ -78,22 +80,29 @@ get_num_archs_jobs_and_load() {
         esac
     fi
 
-    # Clamp between 1 and ${max_archs} threads per nvcc job
-    n_arch=$(( n_arch < 1 ? 1 : n_arch > max_archs ? max_archs : n_arch ));
+    local mem_for_device_objs=1;
+
+    if test ${n_arch} -le 0; then
+        n_arch=1;
+    else
+        # Clamp to `min(n_arch, max_archs)` threads per job
+        n_arch=$((n_arch > max_archs ? max_archs : n_arch));
+        mem_for_device_objs="$((n_arch * max_device_obj_memory_usage))";
+    fi
 
     local -r free_mem="$(free --gibi | grep -E '^Mem:' | tr -s '[:space:]' | cut -d' ' -f7 || echo '0')";
     local -r freeswap="$(free --gibi | grep -E '^Swap:' | tr -s '[:space:]' | cut -d' ' -f4 || echo '0')";
     local -r mem_total="${max_total_system_memory:-${MAX_TOTAL_SYSTEM_MEMORY:-$((free_mem + freeswap))}}";
-    local all_cpus="${parallel}";
-    local n_load="${all_cpus}";
+    local n_load=$((parallel > n_cpus ? n_cpus : parallel));
     # shellcheck disable=SC2155
-    local n_jobs="$(cat<<____EOF | bc
+    local n_jobs="$(
+        echo "
 scale=0
-max_cpu=(${all_cpus} / ${n_arch} / 2 * 3)
-max_mem=(${mem_total} / ${n_arch} / ${max_device_obj_memory_usage})
+max_cpu=(${n_load} / ${n_arch} / 2 * 3)
+max_mem=(${mem_total} / ${mem_for_device_objs})
 if(max_cpu < max_mem) max_cpu else max_mem
-____EOF
-    )";
+" | bc
+    )"
     n_jobs=$((n_jobs < 1 ? 1 : n_jobs));
     n_jobs=$((n_arch > 1 ? n_jobs : n_load));
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index 84eab6f95..a32ea429a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -23,7 +23,7 @@ clean_all() {
 
     eval "$(_parse_args --take '-j,--parallel' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load --archs 1 "$@")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs 0 "$@")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clean-all';
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index d9ae4a41a..0e97cfb32 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -23,7 +23,7 @@ clone_all() {
 
     eval "$(_parse_args --take '-j,--parallel --no-update-env' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load --archs 3 "$@")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs 3 --max-device-obj-memory-usage 1 "$@")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all';
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
index d4cb0b5b9..10ac4cd3d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.cpack.tmpl.sh
@@ -32,7 +32,7 @@ cpack_all() {
     local -r n_repos=$(echo ${NAMES} | wc -w);
     local k=$((n_repos / j));
 
-    eval "$(rapids-get-num-archs-jobs-and-load --archs "${k}" --parallel "${j}" --max-archs "${k}")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs "${k}" --parallel "${j}" --max-archs "${k}" --max-device-obj-memory-usage 1)";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'cpack-all';
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index 75081b8b2..ae2df717e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -35,7 +35,7 @@ cpack_${CPP_LIB}_cpp() {
 
     eval "$(                                              \
     PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}            \
-        rapids-get-num-archs-jobs-and-load --archs 1 "$@" \
+        rapids-get-num-archs-jobs-and-load --archs 0 "$@" \
     )";
 
     # shellcheck disable=SC1091
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
index bb140fbbf..c72cb2d8b 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
@@ -18,9 +18,9 @@ install_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
-    eval "$(                                              \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}            \
-        rapids-get-num-archs-jobs-and-load --archs 1 "$@" \
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
     )";
 
     local py_lib="${PY_LIB}";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 3983d08d8..803996e55 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -31,7 +31,7 @@ clone_${NAME}() {
         -u,--upstream
     ' "$@" <&0)";
 
-    eval "$(rapids-get-num-archs-jobs-and-load --archs 1 "$@")";
+    eval "$(rapids-get-num-archs-jobs-and-load --archs 0 "$@")";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all clone-${NAME}';

From a455f0cebf729794f7d4225bc280d225de47c57d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 23:42:42 -0800
Subject: [PATCH 187/217] filter comments from pip requirements

---
 .../opt/rapids-build-utils/bin/make-pip-dependencies.sh          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index e46006793..e39014b00 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -108,6 +108,7 @@ make_pip_dependencies() {
         # Generate a combined requirements.txt file
         # shellcheck disable=SC2154
         cat "${requirement[@]}" "${pip_reqs_txts[@]}"                                                           \
+      | (grep -v '^#' || [ "$?" == "1" ])                                                                       \
       | (grep -v -E '^$' || [ "$?" == "1" ])                                                                    \
       | ( if test -n "${no_dedupe:-}"; then cat -; else tr -s "[:blank:]" | LC_ALL=C sort -u; fi )              \
       | (grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ])  \

From b89951bc4aaf67ef47e9d4643b9d8fc482aeed9b Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 23:43:01 -0800
Subject: [PATCH 188/217] randomize sccache_server_port on container creation

---
 .../src/utils/opt/devcontainer/bin/post-create-command.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/features/src/utils/opt/devcontainer/bin/post-create-command.sh b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
index c96fc7a1e..dbda132a3 100755
--- a/features/src/utils/opt/devcontainer/bin/post-create-command.sh
+++ b/features/src/utils/opt/devcontainer/bin/post-create-command.sh
@@ -7,13 +7,14 @@ if ! test -f /var/run/crond.pid; then
     cron 2>/dev/null || true;
 fi
 
+. "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/update-envvars.sh";
+
 # If SSH_AUTH_SOCK exists and isn't owned by the coder user, use socat to proxy
 # between a socket owned by the coder user and the one mounted in from the host
 if test -n "${SSH_AUTH_SOCK:-}" \
 && test "${SSH_AUTH_SOCK}" != ~/.ssh/socket \
 && test "$(stat -c "%u:%g" "${SSH_AUTH_SOCK}")" != "$(id -u):$(id -g)"; then
     # shellcheck disable=SC1091
-    . "$(dirname "$(realpath -m "${BASH_SOURCE[0]}")")/update-envvars.sh";
     reset_envvar SSH_AUTH_SOCK;
     ssh_auth_sock=~/.ssh/socket;
     # If the remapped ssh socket doesn't already exist
@@ -29,3 +30,8 @@ if test -n "${SSH_AUTH_SOCK:-}" \
     export SSH_AUTH_SOCK="${ssh_auth_sock}";
     unset ssh_auth_sock;
 fi
+
+# Randomize the sccache server port in case the container is launched with --network=host
+if test -z "${SCCACHE_SERVER_PORT:-}"; then
+    export_envvar SCCACHE_SERVER_PORT "$((4220 + $RANDOM % 4999))";
+fi

From 87cc51aab6ed0c5e7ac7a12da443846977d38f24 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 27 Feb 2024 23:47:00 -0800
Subject: [PATCH 189/217] tee all vault-s3-creds-{generate,schedule} logs to
 the logfile, regenerate creds 5 minutes before they expire

---
 .../bin/vault/s3/creds/generate.sh            | 31 +++++++++++++------
 .../bin/vault/s3/creds/schedule.sh            | 28 ++++++++++++-----
 2 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index 43e2d4c64..b834a5b90 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -47,10 +47,11 @@ generate_s3_creds() {
         exit 1;
     fi
 
-    echo ""
-    echo "$(date)";
-    echo "Attempting to use your GitHub account to authenticate";
-    echo "with vault at '${VAULT_HOST}'.";
+    cat <<____EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+$(date)
+Attempting to use your GitHub account to authenticate with vault at:
+'${VAULT_HOST}'.
+____EOF
 
     local vault_token="null";
 
@@ -58,11 +59,15 @@ generate_s3_creds() {
     eval "$(devcontainer-utils-vault-auth-github "${VAULT_HOST}" "${user_orgs}")";
 
     if [ "${vault_token:-null}" = "null" ]; then
-        echo "Your GitHub user was not recognized by vault. Skipping." >&2;
+        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log >&2
+Your GitHub user was not recognized by vault. Skipping.
+________EOF
         exit 1;
     fi
 
-    echo "Successfully authenticated with vault!";
+    cat <<____EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+Successfully authenticated with vault!
+____EOF
 
     local -r generated_at="$(date '+%s')";
     local ttl="${VAULT_S3_TTL:-"28800"}";
@@ -86,23 +91,29 @@ generate_s3_creds() {
     local -r aws_secret_access_key="$(jq -r '.secret_key' <<< "${aws_creds}" || echo)";
 
     if grep -qE "^null$" <<< "${aws_access_key_id:-null}"; then
-        echo "Failed to retrieve AWS S3 credentials. Skipping." >&2;
+        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log >&2
+Failed to retrieve AWS S3 credentials. Skipping.
+________EOF
         exit 1;
     fi
 
     if grep -qE "^null$" <<< "${aws_secret_access_key:-null}"; then
-        echo "Failed to retrieve AWS S3 credentials. Skipping." >&2;
+        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log >&2
+Failed to retrieve AWS S3 credentials. Skipping.
+________EOF
         exit 1;
     fi
 
-    echo "Successfully generated temporary AWS S3 credentials!";
+    cat <<____EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+Successfully generated temporary AWS S3 credentials!
+____EOF
 
     # Block until the new temporary AWS S3 credentials propagate
     if  SCCACHE_BUCKET="${SCCACHE_BUCKET:-}" \
         SCCACHE_REGION="${SCCACHE_REGION:-}" \
         AWS_ACCESS_KEY_ID="${aws_access_key_id:-}"         \
         AWS_SECRET_ACCESS_KEY="${aws_secret_access_key:-}" \
-        devcontainer-utils-vault-s3-creds-propagate; then
+        devcontainer-utils-vault-s3-creds-propagate | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log; then
         # Store creds in ~/.aws dir
         devcontainer-utils-vault-s3-creds-persist - <<<         \
             --stamp="${generated_at:-}"                         \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index 17dfb91d3..3cc805046 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -13,13 +13,26 @@ schedule_s3_creds_refresh() {
 
     local -r stamp="$(cat ~/.aws/stamp 2>/dev/null || echo "${now}")";
     local then="$((ttl - (now - stamp)))";
-    then="$((then < ttl ? ttl : then))";
+    then="$((then < ttl ? then : ttl))";
     then="$((((then + 59) / 60) * 60))";
-    then="$((now + then))";
 
-    crontab -u "$(whoami)" -r 2>/dev/null || true;
+    # Regenerate if within 5 minutes of keys expiring
+    if test "${then}" -le 300; then
+        if devcontainer-utils-vault-s3-creds-generate; then
+            devcontainer-utils-vault-s3-creds-schedule;
+        fi
+    else
+        # Regenerate 5 minutes before keys expire
+        then="$((now + then - 300))";
 
-    cat <<____EOF | crontab -u "$(whoami)" -
+        crontab -u "$(whoami)" -r 2>/dev/null || true;
+
+        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+$(date --date="@${now}")
+Scheduling cron to regerate S3 creds $(date -u --date="@$((then - now))" '+%T') from now.
+________EOF
+
+        cat <<________EOF | crontab -u "$(whoami)" -
 SHELL=/bin/bash
 BASH_ENV="${BASH_ENV:-}"
 VAULT_HOST="${VAULT_HOST:-}"
@@ -30,10 +43,11 @@ SCCACHE_REGION="${SCCACHE_REGION:-}"
 VAULT_GITHUB_ORGS="${VAULT_GITHUB_ORGS:-}"
 AWS_DEFAULT_REGION="${AWS_DEFAULT_REGION:-}"
 $(date --date="@${then}" '+%M %H %d %m %w') \
-bash -lc 'devcontainer-utils-vault-s3-creds-generate && devcontainer-utils-vault-s3-creds-schedule' 2>&1 | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
-____EOF
+devcontainer-utils-vault-s3-creds-schedule
+________EOF
 
-    sudo /etc/init.d/cron restart >/dev/null 2>&1;
+        sudo /etc/init.d/cron restart >/dev/null 2>&1;
+    fi
 }
 
 schedule_s3_creds_refresh "$@";

From 5450f8411f34f7e5424b0c3e105051f77e324906 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 08:50:00 -0800
Subject: [PATCH 190/217] thread tty through xargs

---
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 0e97cfb32..8486f90f9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -28,11 +28,16 @@ clone_all() {
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all';
 
+    local _o=;
+    if devcontainer-utils-shell-is-interactive; then
+        _o="<$(tty)";
+    fi
+
     echo ${NAMES} \
   | tr '[:space:]' '\0' \
   | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
     if type clone-% >/dev/null 2>&1; then
-        clone-% -j ${n_arch} --no-update-env ${OPTS[*]} || exit 255;
+        clone-% -j ${n_arch} --no-update-env ${OPTS[*]} ${_o} || exit 255;
     fi
     ";
 

From c318f541f9157903304d13063f4e2ee2b3e115ff Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 08:51:34 -0800
Subject: [PATCH 191/217] thread tty through xargs better

---
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index 8486f90f9..cfa27589a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -30,14 +30,14 @@ clone_all() {
 
     local _o=;
     if devcontainer-utils-shell-is-interactive; then
-        _o="<$(tty)";
+        _o="-o";
     fi
 
     echo ${NAMES} \
   | tr '[:space:]' '\0' \
-  | xargs ${v:+-t} -r -0 -P${n_jobs} -I% bash -c "
+  | xargs ${v:+-t} ${_o} -r -0 -P${n_jobs} -I% bash -c "
     if type clone-% >/dev/null 2>&1; then
-        clone-% -j ${n_arch} --no-update-env ${OPTS[*]} ${_o} || exit 255;
+        clone-% -j ${n_arch} --no-update-env ${OPTS[*]} || exit 255;
     fi
     ";
 

From da3b73d8d6914d424ef038c5ea5f632817326b11 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 09:18:18 -0800
Subject: [PATCH 192/217] use tty exit code in shell-is-interactive check

---
 features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh b/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh
index 1becb26ef..c466a2f12 100755
--- a/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh
+++ b/features/src/utils/opt/devcontainer/bin/shell-is-interactive.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-if (exec < /dev/tty) && [ "${CODESPACES:-false}" != "true" ]; then
+if tty >/dev/null 2>&1 && (exec </dev/tty) && [ "${CODESPACES:-false}" != "true" ]; then
     exit 0;
 fi
 

From 4782014e9b32bec37714cc4efac3b048a7cd0563 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 09:18:28 -0800
Subject: [PATCH 193/217] use read -rsp everywhere

---
 features/src/utils/opt/devcontainer/bin/git/init.sh          | 4 ++--
 features/src/utils/opt/devcontainer/bin/github/repo/clone.sh | 2 +-
 features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/git/init.sh b/features/src/utils/opt/devcontainer/bin/git/init.sh
index e754e4148..75d1bc360 100755
--- a/features/src/utils/opt/devcontainer/bin/git/init.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/init.sh
@@ -20,7 +20,7 @@ init_git_cli_config() {
         local git_user_name_default="anon";
         local git_user_name="${git_user_name_default}";
         if devcontainer-utils-shell-is-interactive; then
-            read -p "Git user.name (${git_user_name_default}): " git_user_name <$(tty);
+            read -rsp "Git user.name (${git_user_name_default}): " git_user_name <$(tty);
         fi
         git config --global user.name "${git_user_name:-"${git_user_name_default}"}" >/dev/null 2>&1 || true;
     fi
@@ -29,7 +29,7 @@ init_git_cli_config() {
         local git_user_email_default="users.noreply.${GITHUB_HOST:-github.com}";
         local git_user_email="${git_user_email_default}";
         if devcontainer-utils-shell-is-interactive; then
-            read -p "Git user.email (${git_user_email_default}): " git_user_email <$(tty);
+            read -rsp "Git user.email (${git_user_email_default}): " git_user_email <$(tty);
         fi
         git config --global user.email "${git_user_email:-"${git_user_email_default}"}" >/dev/null 2>&1 || true;
     fi
diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 6d3d561df..04b64de35 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -132,7 +132,7 @@ clone_github_repo() {
          devcontainer-utils-shell-is-interactive; then
         while true; do
             local CHOICE;
-            read -rp "'${GITHUB_HOST:-github.com}/${user}/${name}.git' not found.
+            read -rsp "'${GITHUB_HOST:-github.com}/${user}/${name}.git' not found.
     Fork '${upstream}' into '${user}/${name}' now (y/n)? " CHOICE <"$(tty)"
             case "${CHOICE:-}" in
                 [Nn]* ) origin="${upstream}"; break;;
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 6baeee01f..70c5fc794 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -157,7 +157,7 @@ clone_gitlab_repo() {
          devcontainer-utils-shell-is-interactive; then
         while true; do
             local CHOICE;
-            read -rp "'${GITLAB_HOST:-gitlab.com}/${user}/${name}.git' not found.
+            read -rsp "'${GITLAB_HOST:-gitlab.com}/${user}/${name}.git' not found.
     Fork '${upstream}' into '${user}/${name}' now (y/n)? " CHOICE <"$(tty)"
             case "${CHOICE:-}" in
                 [Nn]* ) origin="${upstream}"; break;;

From 9697f1bdd307f8321005a78e05946c051860a0d5 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 13:40:34 -0800
Subject: [PATCH 194/217] remove update-content-command, move
 rapids-generate-scripts into post-start-command

---
 features/src/rapids-build-utils/devcontainer-feature.json  | 7 -------
 features/src/rapids-build-utils/install.sh                 | 1 -
 .../opt/rapids-build-utils/bin/post-start-command.sh       | 1 +
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh      | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh     | 2 +-
 .../opt/rapids-build-utils/bin/update-content-command.sh   | 6 ------
 6 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index d4b210343..e7e8608a0 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -6,13 +6,6 @@
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
   },
-  "updateContentCommand": [
-    "/bin/bash",
-    "-li",
-    "+o",
-    "history",
-    "rapids-update-content-command"
-  ],
   "postStartCommand": [
     "/bin/bash",
     "-li",
diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 251e98b53..76257501c 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -70,7 +70,6 @@ declare -a commands=(
     select-pip-install-args
     select-pip-wheel-args
     update-build-dir-links
-    update-content-command
 );
 
 # Install alternatives
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
index c1807f408..f95d10bcc 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_START_COMMAND:-}"; then
+    rapids-generate-scripts;
     rapids-make-vscode-workspace --update;
 fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index cfa27589a..e31fb0686 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -42,7 +42,7 @@ clone_all() {
     ";
 
     if test -z "${no_update_env-}"; then
-        rapids-update-content-command;
+        rapids-post-start-command;
         rapids-post-attach-command;
     fi
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 803996e55..929f45f58 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -72,7 +72,7 @@ clone_${NAME}() {
     git -C "${SRC_PATH}" remote prune upstream;
 
     if test -z "${no_update_env}"; then
-        rapids-update-content-command;
+        rapids-post-start-command;
         rapids-post-attach-command;
     fi
 }
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh
deleted file mode 100755
index b1840e552..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/update-content-command.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-if test -z "${SKIP_RAPIDS_BUILD_UTILS_UPDATE_CONTENT_COMMAND:-}"; then
-    rapids-generate-scripts;
-    rapids-make-vscode-workspace --update;
-fi

From 0a2d129d2dbd78ae4d7f3c26c3e0b9f4c7e28d3e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 14:20:42 -0800
Subject: [PATCH 195/217] merge compile_commands.json into one file in the home
 dir for clangd users not using the workspace

---
 features/src/rapids-build-utils/install.sh    |  1 +
 .../bin/get-cmake-build-dir.sh                | 28 ++++----
 .../bin/merge-compile-commands-json.sh        | 70 +++++++++++++++++++
 .../bin/post-start-command.sh                 |  1 +
 .../bin/tmpl/cpp.configure.tmpl.sh            |  2 +
 5 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index 76257501c..f06d7ee01 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -51,6 +51,7 @@ declare -a commands=(
     make-pip-dependencies
     make-pip-env
     make-vscode-workspace
+    merge-compile-commands-json
     post-attach-command
     post-attach-command-entrypoint
     post-start-command
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
index 5b8675c65..5700f05a3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -17,6 +17,7 @@
 #
 # Boolean options:
 #  -h,--help                           Print this text.
+#  --skip-links                        Don't update any symlinks
 #  --skip-build-type                   Don't update the symlink pointing to the last component of
 #                                      the build dir path, i.e. "latest -> (debug|release)".
 #
@@ -46,20 +47,23 @@ get_cmake_build_dir() {
 
     if test -n "${src:-}" && test -d "${src:-}"; then
         mkdir -p "${src}/${bin}";
-        if test -z "${skip_build_type-}"; then
-            mkdir -p "${src}/${bin}/${type}";
-            cd "${src}/${bin}/" || exit 1;
-            ln -sfn "${type}" latest;
-        fi
-        cd "${src}/build" || exit 1;
-        local component;
-        for component in "${PYTHON_PACKAGE_MANAGER:-}" "${cuda:+cuda-${cuda}}"; do
-            if test -n "${component:-}"; then
-                ln -sfn "${component}/latest" latest;
-                cd "${component}" || exit 1;
+        if  test -z "${skip_links-}"; then
+            if test -z "${skip_build_type-}"; then
+                mkdir -p "${src}/${bin}/${type}";
+                cd "${src}/${bin}/" || exit 1;
+                ln -sfn "${type}" latest;
             fi
-        done
+            cd "${src}/build" || exit 1;
+            local component;
+            for component in "${PYTHON_PACKAGE_MANAGER:-}" "${cuda:+cuda-${cuda}}"; do
+                if test -n "${component:-}"; then
+                    ln -sfn "${component}/latest" latest;
+                    cd "${component}" || exit 1;
+                fi
+            done
+        fi
     fi
+
     if test -n "${skip_build_type-}"; then
         echo "${src:+${src}/}${bin}/latest";
     else
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh
new file mode 100755
index 000000000..e5462da25
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+# Usage:
+#  rapids-merge-compile-commands-json [OPTION]...
+#
+# Merges each build's compile_commands.json into one giant compile_commands.json
+#
+# Boolean options:
+#  -h,--help                  Print this text.
+#
+# Options that require values:
+# @_include_value_options rapids-list-repos -h | tail -n+2 | head -n-1;
+
+# shellcheck disable=SC1091
+. rapids-generate-docstring;
+
+_list_repo_paths() {
+    for ((i=0; i < ${repos_length:-0}; i+=1)); do
+
+        local repo="repos_${i}";
+        local repo_path="${repo}_path";
+        local cpp_length="${repo}_cpp_length";
+        local py_length="${repo}_python_length";
+
+        if test -d ~/"${!repo_path:-}/.git"; then
+
+            for ((j=0; j < ${!cpp_length:-0}; j+=1)); do
+                local cpp_sub_dir="${repo}_cpp_${j}_sub_dir";
+                local cpp_path=~/"${!repo_path:-}${!cpp_sub_dir:+/${!cpp_sub_dir}}";
+                echo "${cpp_path}";
+            done
+
+            for ((j=0; j < ${!py_length:-0}; j+=1)); do
+                local py_sub_dir="${repo}_python_${j}_sub_dir";
+                local py_path=~/"${!repo_path:-}${!py_sub_dir:+/${!py_sub_dir}}";
+                if rapids-python-uses-scikit-build-core "${py_path}"; then
+                    echo "${py_path}";
+                fi
+            done
+        fi
+    done
+}
+
+merge_compile_commands_json() {
+    local -;
+    set -euo pipefail;
+
+    # shellcheck disable=SC1091
+    . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'merge-compile-commands-json';
+
+    eval "$(_parse_args "$@" <&0)";
+    eval "$(rapids-list-repos "$@")";
+
+    readarray -t dirs < <(                                             \
+        _list_repo_paths                                               \
+      | xargs -r -I% -P$(nproc)                                        \
+        rapids-get-cmake-build-dir --skip-links --skip-build-type -- % \
+      | xargs -r -I% echo %/                                           \
+    );
+
+    if test ${#dirs[@]} -gt 0; then
+        readarray -t files < <(find "${dirs[@]}" -maxdepth 1 -type f -name compile_commands.json);
+        if test ${#files[@]} -gt 0; then
+            jq -s '. | flatten' "${files[@]}";
+        fi
+    fi
+}
+
+
+merge_compile_commands_json "$@" <&0;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
index f95d10bcc..79a446b76 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
@@ -3,4 +3,5 @@
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_START_COMMAND:-}"; then
     rapids-generate-scripts;
     rapids-make-vscode-workspace --update;
+    rapids-merge-compile-commands-json > ~/compile_commands.json;
 fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 2ca3784bf..a358ae798 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -65,6 +65,8 @@ configure_${CPP_LIB}_cpp() {
             "${CPP_SRC}/compile_commands.json" \
             ;
     fi
+
+    rapids-merge-compile-commands-json > ~/compile_commands.json;
 }
 
 configure_${CPP_LIB}_cpp "$@" <&0;

From 43997993cc7113a7901faf1b50e563fa6c3eb5c9 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 14:32:28 -0800
Subject: [PATCH 196/217] move everything in rapids-post-attach-command to
 rapids-post-start-command

---
 features/src/rapids-build-utils/devcontainer-feature.json | 7 -------
 features/src/rapids-build-utils/install.sh                | 2 --
 .../bin/post-attach-command-entrypoint.sh                 | 8 --------
 .../opt/rapids-build-utils/bin/post-attach-command.sh     | 8 --------
 .../opt/rapids-build-utils/bin/post-start-command.sh      | 4 ++++
 .../opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh     | 1 -
 .../opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh    | 1 -
 7 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh
 delete mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index e7e8608a0..51ffdfc0d 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -12,12 +12,5 @@
     "+o",
     "history",
     "rapids-post-start-command"
-  ],
-  "postAttachCommand": [
-    "/bin/bash",
-    "-li",
-    "+o",
-    "history",
-    "rapids-post-attach-command"
   ]
 }
diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index f06d7ee01..c160bac6b 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -52,8 +52,6 @@ declare -a commands=(
     make-pip-env
     make-vscode-workspace
     merge-compile-commands-json
-    post-attach-command
-    post-attach-command-entrypoint
     post-start-command
     pull-repositories
     push-repositories
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh
deleted file mode 100755
index adfde43ba..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command-entrypoint.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-export SKIP_RAPIDS_BUILD_UTILS_POST_ATTACH_COMMAND=;
-
-# shellcheck disable=SC1091
-. rapids-post-attach-command;
-
-exec "$@";
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
deleted file mode 100755
index a620ff90b..000000000
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_ATTACH_COMMAND:-}"; then
-    rapids-update-build-dir-links;
-    if test -n "${PYTHON_PACKAGE_MANAGER:-}"; then
-        rapids-make-"${PYTHON_PACKAGE_MANAGER}"-env || true;
-    fi
-fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
index 79a446b76..d98977f94 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-start-command.sh
@@ -2,6 +2,10 @@
 
 if test -z "${SKIP_RAPIDS_BUILD_UTILS_POST_START_COMMAND:-}"; then
     rapids-generate-scripts;
+    rapids-update-build-dir-links;
     rapids-make-vscode-workspace --update;
     rapids-merge-compile-commands-json > ~/compile_commands.json;
+    if test -n "${PYTHON_PACKAGE_MANAGER:-}"; then
+        rapids-make-"${PYTHON_PACKAGE_MANAGER}"-env "$@" || true;
+    fi
 fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
index e31fb0686..7940ea7c9 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clone.tmpl.sh
@@ -43,7 +43,6 @@ clone_all() {
 
     if test -z "${no_update_env-}"; then
         rapids-post-start-command;
-        rapids-post-attach-command;
     fi
 }
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 929f45f58..40b1aaad1 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -73,7 +73,6 @@ clone_${NAME}() {
 
     if test -z "${no_update_env}"; then
         rapids-post-start-command;
-        rapids-post-attach-command;
     fi
 }
 

From 854447c0360556a4cde0e5979c3d57cf7d402e86 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 00:35:58 +0000
Subject: [PATCH 197/217] ensure latest symlink exists if not created

---
 .../opt/rapids-build-utils/bin/get-cmake-build-dir.sh           | 2 +-
 .../opt/rapids-build-utils/bin/merge-compile-commands-json.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
index 5700f05a3..06d3f0546 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/get-cmake-build-dir.sh
@@ -48,7 +48,7 @@ get_cmake_build_dir() {
     if test -n "${src:-}" && test -d "${src:-}"; then
         mkdir -p "${src}/${bin}";
         if  test -z "${skip_links-}"; then
-            if test -z "${skip_build_type-}"; then
+            if test -z "${skip_build_type-}" || ! test -L "${src}/${bin}/latest"; then
                 mkdir -p "${src}/${bin}/${type}";
                 cd "${src}/${bin}/" || exit 1;
                 ln -sfn "${type}" latest;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh
index e5462da25..7314ce5c7 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/merge-compile-commands-json.sh
@@ -55,7 +55,7 @@ merge_compile_commands_json() {
         _list_repo_paths                                               \
       | xargs -r -I% -P$(nproc)                                        \
         rapids-get-cmake-build-dir --skip-links --skip-build-type -- % \
-      | xargs -r -I% echo %/                                           \
+      | xargs -r -I% sh -c 'if test -e %; then echo %/; fi'            \
     );
 
     if test ${#dirs[@]} -gt 0; then

From b5957ee352e27e8baffe0f65614272b0256fdc75 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 21:06:24 -0800
Subject: [PATCH 198/217] parse bools as arrays whose contents are the full
 optarg

---
 .../utils/opt/devcontainer/bin/parse-args.sh  | 35 +++++--------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/parse-args.sh b/features/src/utils/opt/devcontainer/bin/parse-args.sh
index 5316dc033..c1eae6855 100755
--- a/features/src/utils/opt/devcontainer/bin/parse-args.sh
+++ b/features/src/utils/opt/devcontainer/bin/parse-args.sh
@@ -16,7 +16,6 @@ _parse_args_for_file() {
 
     local idx;
     local key;
-    local typ;
     local val;
     local -a arg;
 
@@ -59,7 +58,6 @@ _parse_args_for_file() {
     local -A _map=();
     local -a args=();
     local -a opts=();
-    local -A typs=();
     local -a rest=();
 
     local -A reverse_alias_map=();
@@ -77,8 +75,6 @@ _parse_args_for_file() {
     fi
 
     # Always include the -h,--help flags
-    typs["h"]="bool";
-    typs["help"]="bool";
     take_map["h"]=1;
     take_map["help"]=1;
 
@@ -90,8 +86,6 @@ _parse_args_for_file() {
         done
     done
 
-    for key in "${long_bools[@]}" "${short_bools[@]}"; do typs[${key}]="bool"; done
-    for key in "${long_value[@]}" "${short_value[@]}"; do typs[${key}]="value"; done
 
     local -r optstring="$(                                                                               \
         cat <(_parse_bool_names_from_usage  <<< "${usage}" | _parse_short_names | xargs -r -I% echo -n %)  \
@@ -142,15 +136,14 @@ _parse_args_for_file() {
             case "${opt}" in
                 # short opt is specified but missing a value
                 :)
-                    typ="value";
                     key="${OPTARG}";
                     arg+=("-${key}");
                     ;;
                 # unknown short opt
                 \?)
                     if test "${OPTARG}" == "h"; then
-                        typ="bool";
                         key="${OPTARG}";
+                        val="-${key}";
                         arg+=("-${key}");
                     # Compare ${OPTARG} to ${!idx} with its leading `-`.
                     # This only works when getopts is in silent mode, i.e. when `:` is at the front of the optstring.
@@ -188,21 +181,18 @@ _parse_args_for_file() {
                     case "${OPTARG}" in
                         # known bool opt
                         $long_bools1)
-                            typ="bool";
-                            val="true";
                             key="${OPTARG}";
+                            val="--${key}";
                             arg+=("--${key}");
                             ;;
                         # known bool opt with value after =
                         $long_bools2)
-                            typ="bool";
                             key="${OPTARG%=*}";
-                            val="${OPTARG#*=}";
-                            arg+=("--${key}=${val}");
+                            val="--${OPTARG}";
+                            arg+=("--${OPTARG}");
                             ;;
                         # known value opt with value following
                         $long_value1)
-                            typ="value";
                             key="${OPTARG}";
                             arg+=("--${key}");
                             if [[ ${OPTIND} -le ${#@} && "${!OPTIND:-}" != -* ]]; then
@@ -213,7 +203,6 @@ _parse_args_for_file() {
                             ;;
                         # known value opt with value after =
                         $long_value2)
-                            typ="value";
                             key="${OPTARG%=*}";
                             val="${OPTARG#*=}";
                             arg+=("--${key}=${val}");
@@ -225,8 +214,8 @@ _parse_args_for_file() {
                         # unknown long opt with value following
                         *)
                             if test "${OPTARG}" == "help"; then
-                                typ="bool";
                                 key="${OPTARG}";
+                                val="--${key}";
                                 arg+=("--${key}");
                             else
                                 opts+=("--${OPTARG}");
@@ -240,14 +229,12 @@ _parse_args_for_file() {
                     ;;
                 # known bool opt
                 $short_bools1)
-                    typ="bool";
                     key="${opt}";
-                    val="true";
+                    val="-${key}";
                     arg+=("-${key}");
                     ;;
                 # known value opt with value following
                 $short_value1)
-                    typ="value";
                     key="${opt}";
                     idx=$((OPTIND-1));
                     case "${OPTARG:-}" in
@@ -289,9 +276,7 @@ _parse_args_for_file() {
                     if test -v reverse_alias_map["${key}"]; then
                         key="${reverse_alias_map["${key}"]}";
                     fi
-                    if test "${typ}" = bool; then
-                        _map["${key}"]="${val@Q}";
-                    elif test -z "${_map["${key}"]}"; then
+                    if test -z "${_map["${key}"]}"; then
                         _map["${key}"]="${val@Q}";
                     else
                         _map["${key}"]+=" ${val@Q}";
@@ -341,11 +326,7 @@ _parse_args_for_file() {
             local k_="${key}";
             k_="${k_//-/_}";
             k_="${k_//./_}";
-            if test "${typs["${key}"]}" = bool; then
-                echo "declare ${k_}=${_map["${key}"]}";
-            else
-                echo "declare -a ${k_}=(${_map["${key}"]})";
-            fi
+            echo "declare -a ${k_}=(${_map["${key}"]})";
             local -a aliases="(${alias_map["${key}"]})";
             for alias in "${aliases[@]}"; do
                 local a_="${alias}";

From be1ffee3d2916f2478522eb3f5b4bf3dff7ecc98 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 21:10:31 -0800
Subject: [PATCH 199/217] add -f flag to clone-git-repo, always fetch all
 upstreams, add /tag/ in the name of the local branch created from a tag

---
 .../opt/devcontainer/bin/git/repo/clone.sh    | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
index 625c1d0eb..05ac53262 100755
--- a/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/git/repo/clone.sh
@@ -7,6 +7,7 @@
 #
 # Boolean options:
 #  -h,--help                    Print this text
+#  -f,--force                   Force overwrite of local reference.
 #  -q,--quiet                   Operate quietly. Progress is not reported to the standard error stream.
 #
 # Options that require values:
@@ -59,48 +60,52 @@ clone_git_repo() {
         fi
     fi
 
-    j="${j:+-j ${j}}";
-    q="${q:+--quiet}";
+    local -a qj=("${q[@]}" ${j:+-j $j});
+    local -a fqj=("${f[@]}" "${qj[@]}");
+
     upstream="${upstream:-"${origin}"}";
     directory="$(realpath -m "${directory}")";
 
-    # shellcheck disable=SC2086
     if ! test -d "${directory}"/.git; then
-        git clone ${j} ${q} "${OPTS[@]}" -- "${origin}" "${directory}";
+        git clone "${qj[@]}" "${OPTS[@]}" -- "${origin}" "${directory}";
         git -C "${directory}" remote add upstream "${upstream}" || true;
         git -C "${directory}" remote set-url upstream "${upstream}" || true;
         git -C "${directory}" remote set-url --push upstream read_only || true;
         if test "${upstream}" == "${origin}"; then
             git -C "${directory}" remote set-url --push origin read_only || true;
         fi
-        git -C "${directory}" fetch ${j} ${q} upstream;
     fi
 
-    # shellcheck disable=SC2086
+    git -C "${directory}" fetch "${fqj[@]}" --all;
+
     if test -n "${branch:-}"; then
         local remote;
         for remote in upstream origin; do
             # if remote has branch
-            if git -C "${directory}" ls-remote -q --exit-code -h "${remote}" "${branch}"; then
+            if git -C "${directory}" ls-remote -q --exit-code --heads "${remote}" "${branch}"; then
                 # fetch, checkout, and track the remote branch
-                git -C "${directory}" fetch ${j} ${q} "${remote}" "refs/heads/${branch}";
-                if ! git -C "${directory}" checkout ${q} -b "${branch}" -t "${remote}/${branch}" 2>/dev/null; then
-                    git -C "${directory}" checkout ${q} "${branch}";
+                git -C "${directory}" fetch "${fqj[@]}" "${remote}" "refs/heads/${branch}";
+                if ! git -C "${directory}" checkout "${q[@]}" -b "${branch}" -t "${remote}/${branch}" 2>/dev/null; then
+                    git -C "${directory}" checkout "${q[@]}" "${branch}";
                     git -C "${directory}" branch "${branch}" -u "${remote}/${branch}";
                 fi
                 git -C "${directory}" pull "${remote}" "${branch}";
                 break;
             # if remote has tag
-            elif git -C "${directory}" ls-remote -q --exit-code -t "${remote}" "${branch}"; then
-                # make a local branch for the tag
-                git -C "${directory}" checkout ${q} -m -b "${remote}/${branch}" "${branch}";
+            elif git -C "${directory}" ls-remote -q --exit-code --tags "${remote}" "${branch}"; then
+                # fetch, checkout, and make a local branch for the tag
+                git -C "${directory}" fetch "${fqj[@]}" "${remote}" "refs/tags/${branch}";
+                if ! git -C "${directory}" checkout "${q[@]}" -m -b "${remote}/tag/${branch}" "${branch}" 2>/dev/null; then
+                    # local branch already exists, just check it out
+                    git -C "${directory}" checkout "${q[@]}" "${remote}/tag/${branch}";
+                fi
                 break;
             fi
         done
     fi
 
     # shellcheck disable=SC2086
-    git -C "${directory}" submodule update --recursive ${j} ${q};
+    git -C "${directory}" submodule update --recursive "${qj[@]}";
 }
 
 clone_git_repo "$@" <&0;

From c4896e2a98376558ab02fd395315d9fe9760e4a9 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 21:11:09 -0800
Subject: [PATCH 200/217] don't use API calls to get the upstream and origin
 names if --no-fork or --clone-upstream are passed

---
 features/src/utils/opt/devcontainer/bin/github/repo/clone.sh | 4 +++-
 features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
index 04b64de35..cc0e33272 100755
--- a/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/github/repo/clone.sh
@@ -147,7 +147,9 @@ clone_github_repo() {
     local origin_;
     local upstream_;
 
-    if gh auth status >/dev/null 2>&1; then
+    if test -z "${no_fork:-}" && \
+       test -z "${clone_upstream:-}" && \
+       gh auth status >/dev/null 2>&1; then
         if [ "$(gh config get git_protocol)" = "ssh" ]; then
             origin_="$(get_repo_ssh_url "${origin}")";
             upstream_="$(get_repo_ssh_url "${upstream}")";
diff --git a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
index 70c5fc794..17aebd52b 100755
--- a/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
+++ b/features/src/utils/opt/devcontainer/bin/gitlab/repo/clone.sh
@@ -172,7 +172,9 @@ clone_gitlab_repo() {
     local origin_;
     local upstream_;
 
-    if ! glab auth status 2>&1 | grep -q "No token provided"; then
+    if test -z "${no_fork:-}" && \
+       test -z "${clone_upstream:-}" && \
+     ! glab auth status 2>&1 | grep -q "No token provided"; then
         if [ "$(glab config get git_protocol)" = "ssh" ]; then
             origin_="$(get_repo_ssh_url "${origin}")";
             upstream_="$(get_repo_ssh_url "${upstream}")";

From 04a7475851aea82495cc9ef00c551a3b7c668110 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 21:11:40 -0800
Subject: [PATCH 201/217] always call clone-git{hub,lab}-repo in the repo clone
 template

---
 .../opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 40b1aaad1..77b0f90ef 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -36,10 +36,6 @@ clone_${NAME}() {
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'clone-all clone-${NAME}';
 
-    if [[ -d "${SRC_PATH}"/.git ]]; then
-        return;
-    fi
-
     branch="${b:-"${GIT_TAG}"}";
     directory="${d:-"${SRC_PATH}"}";
     ssh_url="${ssh_url:-${GIT_SSH_URL}}";

From 9d6f1d7e7fdccf89430757c1c334026ff40669ef Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 28 Feb 2024 21:11:49 -0800
Subject: [PATCH 202/217] cleanup docstrings

---
 .../opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh           | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh       | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh    | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
index a32ea429a..809bcee9e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/all.clean.tmpl.sh
@@ -9,7 +9,7 @@
 #
 # Boolean options:
 #  -h,--help            Print this text.
-#  -v,--verbose         verbose output
+#  -v,--verbose         Verbose output.
 #
 # Options that require values:
 #  -j,--parallel <num>  Clean <num> repos in parallel
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 8f967db27..99594196d 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -7,7 +7,7 @@
 #
 # Boolean options:
 #  -h,--help          Print this text.
-#  -v,--verbose       verbose output
+#  -v,--verbose       Verbose output.
 
 # shellcheck disable=SC1091
 . rapids-generate-docstring;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
index 6c8bef0f0..9b0b6c372 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.uninstall.tmpl.sh
@@ -7,7 +7,7 @@
 #
 # Boolean options:
 #  -h,--help     Print this text.
-#  -v,--verbose  Verbose output
+#  -v,--verbose  Verbose output.
 
 # shellcheck disable=SC1091
 . rapids-generate-docstring;
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
index 080d897f1..c27cbabdf 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.uninstall.tmpl.sh
@@ -7,7 +7,7 @@
 #
 # Boolean options:
 #  -h,--help          Print this text.
-#  -v,--verbose       verbose output
+#  -v,--verbose       Verbose output.
 
 # shellcheck disable=SC1091
 . rapids-generate-docstring;

From a644dbadf8280ef62665516cb05f7f5f04bea63a Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 09:48:03 -0800
Subject: [PATCH 203/217] fix reconfigure check

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index ec51f2a1f..8486c618c 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -36,7 +36,7 @@ build_${CPP_LIB}_cpp() {
 
     # Reconfigure if not configured or previous configure failed
     local -r bin_dir="$(rapids-maybe-clean-build-dir "${G:-Ninja}" "$@" -- "${CPP_SRC}")";
-    test -d "${bin_dir:-${CPP_SRC}/${BIN_DIR}}" || configure-${CPP_LIB}-cpp "$@" <&0;
+    test -e "${bin_dir:-${CPP_SRC}/${BIN_DIR}}" || configure-${CPP_LIB}-cpp "$@" <&0;
 
     # Build C++ lib
     time (

From 0372a208d82f6f8af8e45ed0d984d148905f8dcf Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 11:57:47 -0800
Subject: [PATCH 204/217] actually fix reconfigure check

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index 8486c618c..81117615e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -35,7 +35,7 @@ build_${CPP_LIB}_cpp() {
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${CPP_LIB}-cpp';
 
     # Reconfigure if not configured or previous configure failed
-    local -r bin_dir="$(rapids-maybe-clean-build-dir "${G:-Ninja}" "$@" -- "${CPP_SRC}")";
+    local -r bin_dir="$(rapids-maybe-clean-build-dir -G"${G:-Ninja}" "$@" -- "${CPP_SRC}")";
     test -e "${bin_dir:-${CPP_SRC}/${BIN_DIR}}" || configure-${CPP_LIB}-cpp "$@" <&0;
 
     # Build C++ lib

From eaac10262beb77835b7ca93b33f392ba9e3179af Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 13:09:55 -0800
Subject: [PATCH 205/217] always do _parse_args at the top

---
 .../rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh | 15 ++++++++-------
 .../bin/tmpl/cpp.configure.tmpl.sh                | 10 +++++-----
 .../bin/tmpl/python.build.wheel.tmpl.sh           | 10 +++++-----
 .../bin/tmpl/python.install.tmpl.sh               | 10 +++++-----
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index 81117615e..94c7f39cd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -7,7 +7,8 @@
 #
 # @_include_bool_options /usr/bin/configure-${CPP_LIB}-cpp -h;
 # @_include_value_options /usr/bin/configure-${CPP_LIB}-cpp -h;
-# @_include_cmake_build_options
+# @_include_cmake_options;
+# @_include_cmake_build_options;
 
 # shellcheck disable=SC1091
 . rapids-generate-docstring;
@@ -16,21 +17,21 @@ build_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     local -a cmake_args_="(${CMAKE_ARGS:-})";
     cmake_args_+=(${CPP_CMAKE_ARGS});
 
-    eval "$(_parse_args --take '-G -j,--parallel' "$@" "${cmake_args_[@]}" <&0)";
+    eval "$(_parse_args --take '-G' "$@" "${cmake_args_[@]}" <&0)";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         echo "build-${CPP_LIB}-cpp: cannot access '${CPP_SRC}': No such directory" >&2;
         exit 1;
     fi
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+    )";
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${CPP_LIB}-cpp';
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index a358ae798..254d47635 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -19,11 +19,6 @@ configure_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     local -a cmake_args_="(${CMAKE_ARGS:-})";
     cmake_args_+=(${CPP_CMAKE_ARGS});
 
@@ -34,6 +29,11 @@ configure_${CPP_LIB}_cpp() {
         exit 1;
     fi
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+    )";
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all configure-${NAME} configure-${CPP_LIB}-cpp';
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index 6efe7fb90..f6804efc3 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -18,11 +18,6 @@ build_${PY_LIB}_python_wheel() {
     local -;
     set -euo pipefail;
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     local py_lib="${PY_LIB}";
 
     local -a cmake_args_="(${CMAKE_ARGS:-})";
@@ -37,6 +32,11 @@ build_${PY_LIB}_python_wheel() {
         exit 1;
     fi
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+    )";
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-wheel';
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
index c72cb2d8b..e32c1b8cb 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
@@ -18,11 +18,6 @@ install_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     local py_lib="${PY_LIB}";
 
     local -a cmake_args_="(${CMAKE_ARGS:-})";
@@ -37,6 +32,11 @@ install_${PY_LIB}_python() {
         exit 1;
     fi
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+    )";
+
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-editable install-all install-${NAME} install-${PY_LIB}-python';
 

From d1efae292edb5b0516ee6c9fc17c33149e223a0e Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 16:58:41 -0800
Subject: [PATCH 206/217] don't overwrite the existing install_manifest.txts
 when doing the install for cpack

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
index ae2df717e..e68565737 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.cpack.tmpl.sh
@@ -93,8 +93,16 @@ cpack_${CPP_LIB}_cpp() {
             slug="${name}${vers:+-$vers}${comp:+-$comp}-${kernel}";
             outd="${CPP_SRC}/${BIN_DIR}/_CPack_Packages/${kernel}/TGZ";
 
+            if test -f "${CPP_SRC}/${BIN_DIR}/install_manifest${comp:+_$comp}.txt"; then
+                mv "${CPP_SRC}/${BIN_DIR}/install_manifest${comp:+_$comp}.txt"{,.bak};
+            fi
+
             install-${CPP_LIB}-cpp --prefix "${outd}/${slug}" ${comp:+--component "${comp}"} "${OPTS[@]}" >/dev/null 2>&1;
 
+            if test -f "${CPP_SRC}/${BIN_DIR}/install_manifest${comp:+_$comp}.txt.bak"; then
+                mv "${CPP_SRC}/${BIN_DIR}/install_manifest${comp:+_$comp}.txt"{.bak,};
+            fi
+
             if test -d "${outd}/${slug}"; then
                 tar -C "${outd}" -c ${v:+-v} -f "${outd}/${slug}.tar.gz" -I "pigz -p ${n_jobs}" "${slug}";
                 cp -a "${outd}/${slug}.tar.gz" "${CPP_SRC}/${BIN_DIR}/";

From 189eebd0375a45bf1e619f885ad2913ce28994bf Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 16:59:10 -0800
Subject: [PATCH 207/217] support uninstalling from the cpack'd tgz's if the
 build dir doesn't have install_manifest.txt

---
 .../bin/tmpl/cpp.uninstall.tmpl.sh            | 55 +++++++++++++++++--
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
index 99594196d..62faa2475 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.uninstall.tmpl.sh
@@ -8,25 +8,70 @@
 # Boolean options:
 #  -h,--help          Print this text.
 #  -v,--verbose       Verbose output.
+#
+# Options that require values:
+#  -o,--out-dir <dir>                            Uninstall files from cpack'd TGZ in <dir>
+#                                                (default: none)
+# @echo "$(rapids-select-cmake-install-args -h 2>&1 | tail -n-2 | head -n-1)"
+# @echo "$(rapids-select-cmake-install-args -h 2>&1 | tail -n-4 | head -n-3)"
 
 # shellcheck disable=SC1091
 . rapids-generate-docstring;
 
+_list_archive() {
+    find "${outd}/" -regextype sed -iregex ".*/${patt}.tar.gz" -print0 \
+  | xargs -0 ${v:+-t} -r -I% tar -tzf "%"                              \
+  | sed -r "s/^${patt}/${prefix//\//\\/}/I"                            \
+  ;
+}
+
 uninstall_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
-    eval "$(_parse_args "$@" <&0)";
+    eval "$(_parse_args "$@" ${CPP_CPACK_ARGS} <&0)";
 
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'uninstall-all uninstall-${NAME} uninstall-${CPP_LIB}-cpp';
 
-    if test -f "${CPP_SRC}/${BIN_DIR}/install_manifest.txt"; then
-        time (
-            xargs ${v:+-t} -rd "\n" --arg-file=<(<"${CPP_SRC}/${BIN_DIR}/install_manifest.txt" tr -d "\r") rm -f ${v:+-v} --;
+    ((${#component[@]})) || component=(all);
+
+    prefix="$(realpath -ms "${prefix:-${CONDA_PREFIX:-${CMAKE_INSTALL_PREFIX:-/usr}}}")";
+
+    time (
+        local i;
+        local -r kernel="$(uname -s)";
+
+        for ((i=0; i < ${#component[@]}; i+=1)); do
+            local comp="${component[$i]}";
+            if test "all" = "${comp}";
+                then comp="";
+            fi
+
+            if test -f "${CPP_SRC}/${BIN_DIR}/install_manifest${comp:+_$comp}.txt"; then
+                xargs -rd "\n" --arg-file=<(<"${CPP_SRC}/${BIN_DIR}/install_manifest${comp:+_$comp}.txt" tr -d "\r") rm -f ${v:+-v} --;
+            else
+
+                local outd="";
+
+                if test -z "${out_dir-}" || test "${#out_dir[@]}" -eq 0; then
+                    continue;
+                elif test "${i}" -lt "${#out_dir[@]}"; then
+                    outd="$(realpath -ms "${out_dir[$i]}")";
+                else
+                    outd="$(realpath -ms "${out_dir[${#out_dir[@]}-1]}")";
+                fi
+
+                # shellcheck disable=SC2016
+                if test -n "${outd:-}"; then
+                    local patt="cudf-.*${comp:+-$comp}-${kernel}";
+                    _list_archive | grep -Ev '^.*/$' | xargs -rd'\n' rm -f ${v:+-v} --;
+                    _list_archive | grep -E '^.*/$'  | xargs -rd'\n' rmdir ${v:+-v} --ignore-fail-on-non-empty 2>/dev/null || true;
+                fi
+            fi
+        done
         { set +x; } 2>/dev/null; echo -n "lib${CPP_LIB} uninstall time:";
     ) 2>&1;
-    fi
 }
 
 uninstall_${CPP_LIB}_cpp "$@" <&0;

From 3e21711672ad33168ebac4b81c78a3e41144e8b7 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 17:36:46 -0800
Subject: [PATCH 208/217] determine parallelism so args from manifest.yaml can
 use it, but ignore `-h` text on stderr

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh | 11 ++++++-----
 .../rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh | 11 ++++++-----
 .../bin/tmpl/python.build.wheel.tmpl.sh               | 11 ++++++-----
 .../bin/tmpl/python.install.tmpl.sh                   | 11 ++++++-----
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index 94c7f39cd..a6657972e 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -17,6 +17,12 @@ build_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+        2>/dev/null                             \
+    )";
+
     local -a cmake_args_="(${CMAKE_ARGS:-})";
     cmake_args_+=(${CPP_CMAKE_ARGS});
 
@@ -27,11 +33,6 @@ build_${CPP_LIB}_cpp() {
         exit 1;
     fi
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${CPP_LIB}-cpp';
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
index 254d47635..4227cf19a 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.configure.tmpl.sh
@@ -19,6 +19,12 @@ configure_${CPP_LIB}_cpp() {
     local -;
     set -euo pipefail;
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+        2>/dev/null                             \
+    )";
+
     local -a cmake_args_="(${CMAKE_ARGS:-})";
     cmake_args_+=(${CPP_CMAKE_ARGS});
 
@@ -29,11 +35,6 @@ configure_${CPP_LIB}_cpp() {
         exit 1;
     fi
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'configure-all configure-${NAME} configure-${CPP_LIB}-cpp';
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index f6804efc3..d1628203f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -18,6 +18,12 @@ build_${PY_LIB}_python_wheel() {
     local -;
     set -euo pipefail;
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+        2>/dev/null                             \
+    )";
+
     local py_lib="${PY_LIB}";
 
     local -a cmake_args_="(${CMAKE_ARGS:-})";
@@ -32,11 +38,6 @@ build_${PY_LIB}_python_wheel() {
         exit 1;
     fi
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-wheel';
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
index e32c1b8cb..657e791fd 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
@@ -18,6 +18,12 @@ install_${PY_LIB}_python() {
     local -;
     set -euo pipefail;
 
+    eval "$(                                    \
+    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
+        rapids-get-num-archs-jobs-and-load "$@" \
+        2>/dev/null                             \
+    )";
+
     local py_lib="${PY_LIB}";
 
     local -a cmake_args_="(${CMAKE_ARGS:-})";
@@ -32,11 +38,6 @@ install_${PY_LIB}_python() {
         exit 1;
     fi
 
-    eval "$(                                    \
-    PARALLEL_LEVEL=${PARALLEL_LEVEL:-$(nproc)}  \
-        rapids-get-num-archs-jobs-and-load "$@" \
-    )";
-
     # shellcheck disable=SC1091
     . devcontainer-utils-debug-output 'rapids_build_utils_debug' 'build-all build-${NAME} build-${PY_LIB}-python build-${PY_LIB}-python-editable install-all install-${NAME} install-${PY_LIB}-python';
 

From 781f7fdad41af729a2b9c173a32afd1f075b527f Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Thu, 29 Feb 2024 22:42:32 -0800
Subject: [PATCH 209/217] remove -j from options list

---
 .../opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
index a6657972e..015c11923 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/cpp.build.tmpl.sh
@@ -26,7 +26,7 @@ build_${CPP_LIB}_cpp() {
     local -a cmake_args_="(${CMAKE_ARGS:-})";
     cmake_args_+=(${CPP_CMAKE_ARGS});
 
-    eval "$(_parse_args --take '-G' "$@" "${cmake_args_[@]}" <&0)";
+    eval "$(_parse_args --take '-G -j,--parallel' "$@" "${cmake_args_[@]}" <&0)";
 
     if [[ ! -d "${CPP_SRC}" ]]; then
         echo "build-${CPP_LIB}-cpp: cannot access '${CPP_SRC}': No such directory" >&2;

From 4dfcdd80f6e30e82992932ec877732fe70e6afaf Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 4 Mar 2024 22:32:14 +0000
Subject: [PATCH 210/217] bump feature versions

---
 features/src/gitlab-cli/devcontainer-feature.json         | 2 +-
 features/src/mambaforge/devcontainer-feature.json         | 2 +-
 features/src/mambaforge/install.sh                        | 4 ++--
 features/src/rapids-build-utils/devcontainer-feature.json | 2 +-
 features/src/sccache/devcontainer-feature.json            | 2 +-
 features/src/utils/devcontainer-feature.json              | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/features/src/gitlab-cli/devcontainer-feature.json b/features/src/gitlab-cli/devcontainer-feature.json
index 89791f5f1..053b044cf 100644
--- a/features/src/gitlab-cli/devcontainer-feature.json
+++ b/features/src/gitlab-cli/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
   "id": "gitlab-cli",
-  "version": "24.4.1",
+  "version": "24.4.2",
   "name": "GitLab CLI",
   "documentationURL": "https://github.com/rapidsai/devcontainers/features/tree/main/src/gitlab-cli",
   "description": "Installs the GitLab CLI. Auto-detects latest version and installs needed dependencies.",
diff --git a/features/src/mambaforge/devcontainer-feature.json b/features/src/mambaforge/devcontainer-feature.json
index 15deeb6c5..c8d60605d 100644
--- a/features/src/mambaforge/devcontainer-feature.json
+++ b/features/src/mambaforge/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "Mambaforge",
   "id": "mambaforge",
-  "version": "24.4.3",
+  "version": "24.4.4",
   "description": "A feature to install mambaforge",
   "options": {
     "version": {
diff --git a/features/src/mambaforge/install.sh b/features/src/mambaforge/install.sh
index 0b6540798..d6c3e9760 100644
--- a/features/src/mambaforge/install.sh
+++ b/features/src/mambaforge/install.sh
@@ -51,8 +51,8 @@ $(cat .bashrc)
 EOF
 )";
 # export envvars in /etc/profile.d
-ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-conda.sh;
-ln -s /opt/conda/etc/profile.d/mamba.sh /etc/profile.d/$(($(find /etc/profile.d/ -maxdepth 1 -type f -name '*.sh' | wc -l) + 20))-mamba.sh;
+ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-conda.sh;
+ln -s /opt/conda/etc/profile.d/mamba.sh /etc/profile.d/$(($(ls -1q /etc/profile.d/*.sh | wc -l) + 20))-mamba.sh;
 add_etc_profile_d_script mambaforge "$(cat .bashrc)";
 
 # Update the devcontainers/features/common-utils __bash_prompt fn
diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
index 51ffdfc0d..4827a21db 100644
--- a/features/src/rapids-build-utils/devcontainer-feature.json
+++ b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "24.4.1",
+  "version": "24.4.2",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"
diff --git a/features/src/sccache/devcontainer-feature.json b/features/src/sccache/devcontainer-feature.json
index 0566d2545..ea43a58ed 100644
--- a/features/src/sccache/devcontainer-feature.json
+++ b/features/src/sccache/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "sccache",
   "id": "sccache",
-  "version": "24.4.1",
+  "version": "24.4.2",
   "description": "A feature to install sccache",
   "options": {
     "version": {
diff --git a/features/src/utils/devcontainer-feature.json b/features/src/utils/devcontainer-feature.json
index bc596f609..3b979afc0 100644
--- a/features/src/utils/devcontainer-feature.json
+++ b/features/src/utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "devcontainer-utils",
   "id": "utils",
-  "version": "24.4.7",
+  "version": "24.4.8",
   "description": "A feature to install RAPIDS devcontainer utility scripts",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

From 8c221928760a841dda7b42553304d3d810c2f034 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 4 Mar 2024 23:28:06 +0000
Subject: [PATCH 211/217] remove rapids-post-attach-command

---
 .devcontainer/cuda11.8-conda/devcontainer.json | 2 +-
 .devcontainer/cuda11.8-pip/devcontainer.json   | 2 +-
 .devcontainer/cuda12.0-conda/devcontainer.json | 2 +-
 .devcontainer/cuda12.0-pip/devcontainer.json   | 2 +-
 .devcontainer/cuda12.2-conda/devcontainer.json | 2 +-
 .devcontainer/cuda12.2-pip/devcontainer.json   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
index bff8470ba..f2b33fc25 100644
--- a/.devcontainer/cuda11.8-conda/devcontainer.json
+++ b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -18,7 +18,7 @@
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda11.8-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
-  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
+  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
   "mounts": [
diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index 9f325bbe0..af7ac5b99 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -22,7 +22,7 @@
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda11.8-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
-  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
+  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
   "mounts": [
diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
index 48bdb5142..3c68ab734 100644
--- a/.devcontainer/cuda12.0-conda/devcontainer.json
+++ b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -18,7 +18,7 @@
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.0-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
-  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
+  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
   "mounts": [
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index fe28c33c4..df4891959 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -22,7 +22,7 @@
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.0-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
-  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
+  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
   "mounts": [
diff --git a/.devcontainer/cuda12.2-conda/devcontainer.json b/.devcontainer/cuda12.2-conda/devcontainer.json
index c36dba606..de72c40fd 100644
--- a/.devcontainer/cuda12.2-conda/devcontainer.json
+++ b/.devcontainer/cuda12.2-conda/devcontainer.json
@@ -18,7 +18,7 @@
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.2-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
-  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
+  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
   "mounts": [
diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json
index bec305ba5..c2e7ac693 100644
--- a/.devcontainer/cuda12.2-pip/devcontainer.json
+++ b/.devcontainer/cuda12.2-pip/devcontainer.json
@@ -22,7 +22,7 @@
     "./features/src/rapids-build-utils"
   ],
   "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.2-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
-  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"],
+  "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
   "mounts": [

From 7a13e7771a0ff064fa07179b330bb88b1af114c5 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 4 Mar 2024 23:28:34 +0000
Subject: [PATCH 212/217] guard against verbose[0] being null now that
 everything's an array again

---
 .../rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh  | 2 +-
 .../opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh  | 6 +++---
 .../opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
index d1628203f..03f28c8c6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.build.wheel.tmpl.sh
@@ -51,7 +51,7 @@ build_${PY_LIB}_python_wheel() {
 
     local ninja_args=();
 
-    if test -n "${v}"; then
+    if test -n "${v-}"; then
         ninja_args+=("-v");
     fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
index 657e791fd..1af7216f6 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/python.install.tmpl.sh
@@ -49,15 +49,15 @@ install_${PY_LIB}_python() {
         $(rapids-select-cmake-args "$@")
     )";
 
-    if test -n "${v}"; then
+    if test -n "${v-}"; then
         ninja_args+=("-v");
     fi
 
-    if test -n "${n_jobs}"; then
+    if test -n "${n_jobs-}"; then
         ninja_args+=("-j${n_jobs}");
     fi
 
-    if test -n "${n_load}"; then
+    if test -n "${n_load-}"; then
         ninja_args+=("-l${n_load}");
     fi
 
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
index 77b0f90ef..16897ce2f 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/tmpl/repo.clone.tmpl.sh
@@ -67,7 +67,7 @@ clone_${NAME}() {
 
     git -C "${SRC_PATH}" remote prune upstream;
 
-    if test -z "${no_update_env}"; then
+    if test -z "${no_update_env-}"; then
         rapids-post-start-command;
     fi
 }

From be770b5ea934f46c255985b0deb1e763b30974af Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Mon, 4 Mar 2024 23:41:08 +0000
Subject: [PATCH 213/217] clean up boolean arg handling

---
 .../opt/rapids-build-utils/bin/make-conda-env.sh              | 4 ++--
 .../opt/rapids-build-utils/bin/make-pip-dependencies.sh       | 2 +-
 .../opt/rapids-build-utils/bin/make-pip-env.sh                | 4 ++--
 .../opt/rapids-build-utils/bin/select-cmake-install-args.sh   | 2 +-
 .../src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
index d9095168d..a84273a37 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-env.sh
@@ -26,8 +26,8 @@ make_conda_env() {
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.yml";
 
-    # Remove the current conda env if called with `-f|--force`
-    if test -n "${f:-${force:-}}"; then
+    # Remove the current conda env if called with `-f,--force`
+    if test -n "${f-}"; then
         rm -rf "${HOME}/.conda/envs/${env_name}" \
                "${HOME}/.conda/envs/${env_file_name}";
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
index e39014b00..1371967e4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-dependencies.sh
@@ -110,7 +110,7 @@ make_pip_dependencies() {
         cat "${requirement[@]}" "${pip_reqs_txts[@]}"                                                           \
       | (grep -v '^#' || [ "$?" == "1" ])                                                                       \
       | (grep -v -E '^$' || [ "$?" == "1" ])                                                                    \
-      | ( if test -n "${no_dedupe:-}"; then cat -; else tr -s "[:blank:]" | LC_ALL=C sort -u; fi )              \
+      | ( if test -n "${no_dedupe-}"; then cat -; else tr -s "[:blank:]" | LC_ALL=C sort -u; fi )               \
       | (grep -v -P "^($(tr -d '[:blank:]' <<< "${pip_noinstall[@]/%/|}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ])  \
       | sed -E "s/-cu([0-9]+)/-cu${cuda_version_major}/g"                                                       \
       | sed -E "s/^cupy-cuda[0-9]+x/cupy-cuda${cuda_version_major}x/g"                                          \
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
index 629a4fed4..45d98cae0 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-pip-env.sh
@@ -34,8 +34,8 @@ make_pip_env() {
     local env_name="${1}"; shift;
     local env_file_name="${env_name}.requirements.txt";
 
-    # Remove the current virtual env if called with `-f|--force`
-    if test -n "${force:-}"; then
+    # Remove the current virtual env if called with `-f,--force`
+    if test -n "${f-}"; then
         rm -rf "${HOME}/.local/share/venvs/${env_name}" \
                "${HOME}/.local/share/venvs/${env_file_name}";
     fi
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh
index bdd285490..d53a1e7a4 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/select-cmake-install-args.sh
@@ -8,7 +8,7 @@
 # CMake Install Options:
 # Boolean options:
 #  --strip                                       Strip before installing.
-#  -v --verbose                                  Enable verbose output.
+#  -v,--verbose                                  Enable verbose output.
 #
 # Options that require values:
 #  --config <cfg>                                For multi-configuration tools, choose <cfg>.
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
index e24ddbbf0..6b2365a46 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/persist.sh
@@ -52,7 +52,7 @@ persist_s3_creds() {
         echo "${stamp:-}" > ~/.aws/stamp;
     fi
 
-    if ! grep -qE "^$" <<< "${no_bucket:-}"; then
+    if ! grep -qE "^$" <<< "${no_bucket-}"; then
         unset_envvar "SCCACHE_BUCKET";
     elif ! grep -qE "^$" <<< "${bucket:-}"; then
         export_envvar "SCCACHE_BUCKET" "${bucket}";
@@ -61,7 +61,7 @@ bucket=${bucket:-}
 ________EOF
     fi
 
-    if ! grep -qE "^$" <<< "${no_region:-}"; then
+    if ! grep -qE "^$" <<< "${no_region-}"; then
         unset_envvar "SCCACHE_REGION";
     elif ! grep -qE "^$" <<< "${region:-}"; then
         export_envvar "SCCACHE_REGION" "${region}";

From 25a8db42cc2b72a9fc67ce2cb26664b41a093fad Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 5 Mar 2024 00:02:20 +0000
Subject: [PATCH 214/217] add stub rapids-post-attach-command for
 backwards-compatibility

---
 features/src/rapids-build-utils/install.sh                     | 1 +
 .../opt/rapids-build-utils/bin/post-attach-command.sh          | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100755 features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh

diff --git a/features/src/rapids-build-utils/install.sh b/features/src/rapids-build-utils/install.sh
index c160bac6b..3c10a9196 100644
--- a/features/src/rapids-build-utils/install.sh
+++ b/features/src/rapids-build-utils/install.sh
@@ -52,6 +52,7 @@ declare -a commands=(
     make-pip-env
     make-vscode-workspace
     merge-compile-commands-json
+    post-attach-command
     post-start-command
     pull-repositories
     push-repositories
diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
new file mode 100755
index 000000000..1141cdad1
--- /dev/null
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/post-attach-command.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+# Logic moved to rapids-post-start-command

From 6be744639676c8bdbb41905d71b09f5299be1a72 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 5 Mar 2024 00:31:51 +0000
Subject: [PATCH 215/217] remove CPM_SOURCE_CACHE

---
 .devcontainer/rapids.Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.devcontainer/rapids.Dockerfile b/.devcontainer/rapids.Dockerfile
index 970b88795..b2e8c0c84 100644
--- a/.devcontainer/rapids.Dockerfile
+++ b/.devcontainer/rapids.Dockerfile
@@ -50,5 +50,4 @@ ENV SCCACHE_BUCKET="rapids-sccache-devs"
 ENV VAULT_HOST="https://vault.ops.k8s.rapids.ai"
 ENV HISTFILE="/home/coder/.cache/._bash_history"
 
-ENV CPM_SOURCE_CACHE="/home/coder/.cache/cpm"
 ENV LIBCUDF_KERNEL_CACHE_PATH="/home/coder/cudf/cpp/build/${PYTHON_PACKAGE_MANAGER}/cuda-${CUDA_VERSION}/latest/jitify_cache"

From 2e9c1821204a7e9b651e12921dcdb0d3d563dbec Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 5 Mar 2024 09:47:25 -0800
Subject: [PATCH 216/217] guard against grep failures

---
 .../opt/rapids-build-utils/bin/make-conda-dependencies.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
index 9d037cf1b..db526cb82 100755
--- a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
+++ b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/make-conda-dependencies.sh
@@ -92,10 +92,10 @@ make_conda_dependencies() {
         # shellcheck disable=SC2207
         local conda_noinstall=($(rapids-python-pkg-names) $(rapids-python-conda-pkg-names));
         # Generate a combined conda env yaml file.
-        conda-merge "${conda_env_yamls[@]}"                                                              \
-          | grep -v '^name:'                                                                             \
-          | grep -v -P '^[ ]*?\- (\.git\@[^(main|master)])(.*?)$'                                        \
-          | grep -v -P "^[ ]*?\- ($(tr -d '[:blank:]' <<< "${conda_noinstall[@]/%/ |}"))(=.*|>.*|<.*)?$" \
+        conda-merge "${conda_env_yamls[@]}"                                                                                   \
+          | (grep -v '^name:'                                                                             || [ "$?" == "1" ]) \
+          | (grep -v -P '^[ ]*?\- (\.git\@[^(main|master)])(.*?)$'                                        || [ "$?" == "1" ]) \
+          | (grep -v -P "^[ ]*?\- ($(tr -d '[:blank:]' <<< "${conda_noinstall[@]/%/ |}"))(=.*|>.*|<.*)?$" || [ "$?" == "1" ]) \
           ;
 
         rm -f "${conda_env_yamls[@]}";

From 837fb08005ec3c00489324b0123a98d04410d631 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 5 Mar 2024 21:02:14 +0000
Subject: [PATCH 217/217] log to /var/log/devcontainer-utils/ so we can mount
 over that dir for testing

---
 .../cuda11.8-conda/devcontainer.json          |  3 ++-
 .devcontainer/cuda11.8-pip/devcontainer.json  |  3 ++-
 .../cuda12.0-conda/devcontainer.json          |  3 ++-
 .devcontainer/cuda12.0-pip/devcontainer.json  |  3 ++-
 .../cuda12.2-conda/devcontainer.json          |  3 ++-
 .devcontainer/cuda12.2-pip/devcontainer.json  |  3 ++-
 features/src/utils/install.sh                 | 12 +++++++-----
 .../bin/vault/s3/creds/generate.sh            | 19 ++++++++++++-------
 .../bin/vault/s3/creds/schedule.sh            |  9 +++++++--
 9 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/.devcontainer/cuda11.8-conda/devcontainer.json b/.devcontainer/cuda11.8-conda/devcontainer.json
index f2b33fc25..bd917109c 100644
--- a/.devcontainer/cuda11.8-conda/devcontainer.json
+++ b/.devcontainer/cuda11.8-conda/devcontainer.json
@@ -17,7 +17,7 @@
     "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
-  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda11.8-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
+  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda11.8-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
   "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
@@ -38,6 +38,7 @@
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda11.8-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda11.8-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda11.8-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
   ],
diff --git a/.devcontainer/cuda11.8-pip/devcontainer.json b/.devcontainer/cuda11.8-pip/devcontainer.json
index af7ac5b99..ccd999df9 100644
--- a/.devcontainer/cuda11.8-pip/devcontainer.json
+++ b/.devcontainer/cuda11.8-pip/devcontainer.json
@@ -21,7 +21,7 @@
     "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
-  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda11.8-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
+  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda11.8-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
   "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
@@ -41,6 +41,7 @@
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda11.8-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda11.8-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda11.8-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
   ],
diff --git a/.devcontainer/cuda12.0-conda/devcontainer.json b/.devcontainer/cuda12.0-conda/devcontainer.json
index 3c68ab734..6807e3b93 100644
--- a/.devcontainer/cuda12.0-conda/devcontainer.json
+++ b/.devcontainer/cuda12.0-conda/devcontainer.json
@@ -17,7 +17,7 @@
     "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
-  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.0-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
+  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.0-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
   "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
@@ -38,6 +38,7 @@
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.0-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.0-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.0-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
   ],
diff --git a/.devcontainer/cuda12.0-pip/devcontainer.json b/.devcontainer/cuda12.0-pip/devcontainer.json
index df4891959..5639e07ae 100644
--- a/.devcontainer/cuda12.0-pip/devcontainer.json
+++ b/.devcontainer/cuda12.0-pip/devcontainer.json
@@ -21,7 +21,7 @@
     "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
-  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.0-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
+  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.0-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
   "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
@@ -41,6 +41,7 @@
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.0-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.0-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.0-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
   ],
diff --git a/.devcontainer/cuda12.2-conda/devcontainer.json b/.devcontainer/cuda12.2-conda/devcontainer.json
index de72c40fd..ef5713ee8 100644
--- a/.devcontainer/cuda12.2-conda/devcontainer.json
+++ b/.devcontainer/cuda12.2-conda/devcontainer.json
@@ -17,7 +17,7 @@
     "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
-  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.2-envs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
+  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.2-envs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
   "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
@@ -38,6 +38,7 @@
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.2-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.2-conda/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.2-conda/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
   ],
diff --git a/.devcontainer/cuda12.2-pip/devcontainer.json b/.devcontainer/cuda12.2-pip/devcontainer.json
index c2e7ac693..79ae36b44 100644
--- a/.devcontainer/cuda12.2-pip/devcontainer.json
+++ b/.devcontainer/cuda12.2-pip/devcontainer.json
@@ -21,7 +21,7 @@
     "./features/src/utils",
     "./features/src/rapids-build-utils"
   ],
-  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.2-venvs} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
+  "initializeCommand": ["/bin/bash", "-c", "mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config/pip,local/share/${localWorkspaceFolderBasename}-cuda12.2-venvs,log/devcontainer-utils} ${localWorkspaceFolder}/../{rmm,kvikio,ucxx,cudf,raft,cumlprims_mg,cuml,cugraph-ops,wholegraph,cugraph,cuspatial}"],
   "postAttachCommand": ["/bin/bash", "-c", "if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; fi"],
   "workspaceFolder": "/home/coder",
   "workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/devcontainers,type=bind,consistency=consistent",
@@ -41,6 +41,7 @@
     "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/../.local/share/${localWorkspaceFolderBasename}-cuda12.2-venvs,target=/home/coder/.local/share/venvs,type=bind,consistency=consistent",
+    "source=${localWorkspaceFolder}/../.log/devcontainer-utils,target=/var/log/devcontainer-utils,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.2-pip/features/src/utils/opt/devcontainer/bin,target=/opt/devcontainer/bin,type=bind,consistency=consistent",
     "source=${localWorkspaceFolder}/.devcontainer/cuda12.2-pip/features/src/rapids-build-utils/opt/rapids-build-utils,target=/opt/rapids-build-utils,type=bind,consistency=consistent"
   ],
diff --git a/features/src/utils/install.sh b/features/src/utils/install.sh
index 5804753db..e8b4699e8 100644
--- a/features/src/utils/install.sh
+++ b/features/src/utils/install.sh
@@ -49,12 +49,14 @@ fi
 # rm -rf /etc/crontab /etc/cron.*;
 
 # Allow crond to be run by users in the "crontab" group
-chgrp crontab "$(realpath -m $(which cron))";
-chmod u+s "$(realpath -m $(which cron))";
+chgrp crontab "$(realpath -m "$(which cron)")";
+chmod u+s "$(realpath -m "$(which cron)")";
 
-touch /var/log/devcontainer-utils-vault-s3-creds-refresh.log;
-chmod 0664 /var/log/devcontainer-utils-vault-s3-creds-refresh.log;
-chgrp crontab /var/log/devcontainer-utils-vault-s3-creds-refresh.log;
+# shellcheck disable=SC2174
+mkdir -m 0775 -p /var/log/devcontainer-utils;
+touch /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+chmod 0664 /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+chgrp crontab /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
 
 # Install Devcontainer utility scripts to /opt/devcontainer
 cp -ar ./opt/devcontainer /opt/;
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
index b834a5b90..ec21641b2 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/generate.sh
@@ -47,7 +47,12 @@ generate_s3_creds() {
         exit 1;
     fi
 
-    cat <<____EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+    sudo mkdir -m 0775 -p /var/log/devcontainer-utils;
+    sudo touch /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+    sudo chmod 0664 /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+    sudo chgrp crontab /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+
+    cat <<____EOF | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log
 $(date)
 Attempting to use your GitHub account to authenticate with vault at:
 '${VAULT_HOST}'.
@@ -59,13 +64,13 @@ ____EOF
     eval "$(devcontainer-utils-vault-auth-github "${VAULT_HOST}" "${user_orgs}")";
 
     if [ "${vault_token:-null}" = "null" ]; then
-        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log >&2
+        cat <<________EOF | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log >&2
 Your GitHub user was not recognized by vault. Skipping.
 ________EOF
         exit 1;
     fi
 
-    cat <<____EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+    cat <<____EOF | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log
 Successfully authenticated with vault!
 ____EOF
 
@@ -91,20 +96,20 @@ ____EOF
     local -r aws_secret_access_key="$(jq -r '.secret_key' <<< "${aws_creds}" || echo)";
 
     if grep -qE "^null$" <<< "${aws_access_key_id:-null}"; then
-        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log >&2
+        cat <<________EOF | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log >&2
 Failed to retrieve AWS S3 credentials. Skipping.
 ________EOF
         exit 1;
     fi
 
     if grep -qE "^null$" <<< "${aws_secret_access_key:-null}"; then
-        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log >&2
+        cat <<________EOF | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log >&2
 Failed to retrieve AWS S3 credentials. Skipping.
 ________EOF
         exit 1;
     fi
 
-    cat <<____EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+    cat <<____EOF | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log
 Successfully generated temporary AWS S3 credentials!
 ____EOF
 
@@ -113,7 +118,7 @@ ____EOF
         SCCACHE_REGION="${SCCACHE_REGION:-}" \
         AWS_ACCESS_KEY_ID="${aws_access_key_id:-}"         \
         AWS_SECRET_ACCESS_KEY="${aws_secret_access_key:-}" \
-        devcontainer-utils-vault-s3-creds-propagate | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log; then
+        devcontainer-utils-vault-s3-creds-propagate | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log; then
         # Store creds in ~/.aws dir
         devcontainer-utils-vault-s3-creds-persist - <<<         \
             --stamp="${generated_at:-}"                         \
diff --git a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
index 3cc805046..2d2b4735b 100755
--- a/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
+++ b/features/src/utils/opt/devcontainer/bin/vault/s3/creds/schedule.sh
@@ -27,7 +27,12 @@ schedule_s3_creds_refresh() {
 
         crontab -u "$(whoami)" -r 2>/dev/null || true;
 
-        cat <<________EOF | tee -a /var/log/devcontainer-utils-vault-s3-creds-refresh.log
+        sudo mkdir -m 0775 -p /var/log/devcontainer-utils;
+        sudo touch /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+        sudo chmod 0664 /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+        sudo chgrp crontab /var/log/devcontainer-utils/vault-s3-creds-refresh.log;
+
+        cat <<________EOF | tee -a /var/log/devcontainer-utils/vault-s3-creds-refresh.log
 $(date --date="@${now}")
 Scheduling cron to regerate S3 creds $(date -u --date="@$((then - now))" '+%T') from now.
 ________EOF
@@ -46,7 +51,7 @@ $(date --date="@${then}" '+%M %H %d %m %w') \
 devcontainer-utils-vault-s3-creds-schedule
 ________EOF
 
-        sudo /etc/init.d/cron restart >/dev/null 2>&1;
+        sudo /etc/init.d/cron restart >>/var/log/devcontainer-utils/vault-s3-creds-refresh.log 2>&1;
     fi
 }