From f477b8e41fc462ed13d9ec1745a234605f57e7be Mon Sep 17 00:00:00 2001
From: Tyler <tylfin@gmail.com>
Date: Thu, 26 Sep 2024 10:24:16 -0400
Subject: [PATCH 1/2] Fix: Install `bash-completion` for `rspm` tab completions

Refs: https://github.com/rstudio/package-manager/issues/14421
---
 package-manager/Dockerfile.ubuntu2204 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/package-manager/Dockerfile.ubuntu2204 b/package-manager/Dockerfile.ubuntu2204
index 771c5a75..bc8a3730 100644
--- a/package-manager/Dockerfile.ubuntu2204
+++ b/package-manager/Dockerfile.ubuntu2204
@@ -4,14 +4,19 @@ ARG PYTHON_VERSION=3.9.17
 ARG PYTHON_VERSION_ALT=3.8.17
 
 # Locale configuration --------------------------------------------------------#
-ENV STARTUP_DEBUG_MODE 0
+ENV STARTUP_DEBUG_MODE=0
 
-ENV PATH /opt/rstudio-pm/bin:$PATH
+ENV PATH=/opt/rstudio-pm/bin:$PATH
 
 # Required Python packages ----------------------------------------------------#
 RUN /opt/python/${PYTHON_VERSION}/bin/python3 -m pip install --no-cache-dir build virtualenv
 RUN /opt/python/${PYTHON_VERSION_ALT}/bin/python3 -m pip install --no-cache-dir build virtualenv
 
+# Install bash auto completion ------------------------------------------------#
+RUN apt-get update -qq && apt-get install -y --no-install-recommends \
+    bash-completion && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
+
 # Download RStudio Package Manager ---------------------------------------------#
 ARG RSPM_VERSION=2024.08.2-9
 ARG RSPM_DOWNLOAD_URL=https://cdn.rstudio.com/package-manager/deb/amd64
@@ -35,12 +40,11 @@ RUN mkdir -p /var/run/rstudio-pm \
 USER rstudio-pm
 COPY rstudio-pm.gcfg /etc/rstudio-pm/rstudio-pm.gcfg
 
-RUN echo "source <(rspm completion bash)" >> ~/.bashrc \
 # Set up licensing to work in userspace mode. This will not prevent activating a
 # license as root, but it is required to activate one as the non-root user at
 # runtime. It's possible for this to fail and the trial will be considered over,
 # in which case we can ignore it anyway.
-  && license-manager initialize --userspace || true
+RUN license-manager initialize --userspace || true
 
 ENTRYPOINT ["tini", "--"]
 CMD ["/usr/local/bin/startup.sh"]

From 1a0f205b507027fd255cc49f531c4e98c8117099 Mon Sep 17 00:00:00 2001
From: Cole Arendt <cole@posit.co>
Date: Fri, 27 Sep 2024 09:37:54 -0400
Subject: [PATCH 2/2] Update CODEOWNERS

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b377d884..7ad379ad 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # format per https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#about-code-owners
-* @colearendt @ianpittwood @bschwedler @costrouc
+* @ianpittwood @bschwedler @costrouc
 
 /connect/* @rstudio/connect
 /connect-content-init/* @rstudio/connect