From a187042daa08939a060a783a5134e4bcda1b1ba8 Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Tue, 14 Jul 2026 14:04:12 -0700
Subject: [PATCH] fix PS1 in the cccl-dev feature

---
 features/src/cccl-dev/.bashrc                   | 5 ++++-
 features/src/cccl-dev/devcontainer-feature.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/features/src/cccl-dev/.bashrc b/features/src/cccl-dev/.bashrc
index eb6605ac..4871d920 100644
--- a/features/src/cccl-dev/.bashrc
+++ b/features/src/cccl-dev/.bashrc
@@ -5,7 +5,10 @@ if  [ -f "${USERHOME}/.local/share/venvs/cccl/bin/activate" ] \
  && [ -z "${VIRTUAL_ENV:-}" -o "${VIRTUAL_ENV}" != "${USERHOME}/.local/share/venvs/cccl" ]; then
     . "${USERHOME}/.local/share/venvs/cccl/bin/activate";
 elif [ -n "${VIRTUAL_ENV_PROMPT:-}" ]; then
-    if ! echo "${PS1:-}" | grep -qF "${VIRTUAL_ENV_PROMPT}"; then
+    if ! grep -qE "(.*) " <<< "${VIRTUAL_ENV_PROMPT}" \
+    && ! grep -qF "(${VIRTUAL_ENV_PROMPT}) " <<< "${PS1:-}"; then
+        export PS1="(${VIRTUAL_ENV_PROMPT}) ${PS1:-}";
+    elif ! grep -qF "${VIRTUAL_ENV_PROMPT}" <<< "${PS1:-}"; then
         export PS1="${VIRTUAL_ENV_PROMPT}${PS1:-}";
     fi
 fi
diff --git a/features/src/cccl-dev/devcontainer-feature.json b/features/src/cccl-dev/devcontainer-feature.json
index 1b030aa9..d8063d3e 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": "26.8.1",
+  "version": "26.8.2",
   "description": "A feature to install NVIDIA CCCL development utilities",
   "options": {
     "litVersion": {