aider: Depend on Python feature instead

I spent too much time goofing around with installing Python and pipx.
Instead, let's just depend on the Python feature and be done with it!
While it's not as efficient, it's a lot simpler and should support more
Linux distributions.

Author: ivy

src/aider/devcontainer-feature.json

@@ -16,6 +16,9 @@
       "description": "Select an Aider version to install."
     }
   },
+  "dependsOn": {
+    "ghcr.io/devcontainers/features/python": {}
+  },
   "installsAfter": [
     "ghcr.io/devcontainers/features/common-utils",
     "ghcr.io/devcontainers/features/python"

src/aider/install.sh

@@ -43,41 +43,12 @@ detect_username() {
             # If there is no non-root user, use the default username.
             USERNAME=root
         fi
-    elif [ "$USERNAME" = "none" ] || ! id -u "$USERNAME" &>/dev/null; then
+    elif [ "$USERNAME" = none ] || ! id -u "$USERNAME" &>/dev/null; then
         # If the specified user does not exist or is unspecified, use default.
         USERNAME=root
     fi
 }
 
-# Install Aider on Debian-based systems.
-install_debian() {
-    if ! dpkg -l pipx &>/dev/null; then
-        echo "pipx not found. Installing..."
-        apt-get update && apt-get install -y pipx
-    fi
-
-    if [ "$AIDER_VERSION" = latest ]; then
-        echo "Installing latest Aider..."
-        su -c 'pipx install aider-chat' "$USERNAME"
-    else
-        echo "Installing Aider version $AIDER_VERSION..."
-        su -c "pipx install aider-chat==${AIDER_VERSION}" "$USERNAME"
-    fi
-}
-
-# Clean up
-clean_up() {
-    case "$ADJUSTED_ID" in
-        debian)
-            rm -rf /var/lib/apt/lists/*
-            ;;
-        *)
-            echo "Unsupported distribution: $ADJUSTED_ID" >&2
-            exit 1
-            ;;
-    esac
-}
-
 # Main entrypoint
 main() {
     if [ "$(id -u)" -ne 0 ]; then
@@ -86,35 +57,15 @@ main() {
     fi
 
     detect_username
-
-    if [ ! -r /etc/os-release ]; then
-        echo "Unsupported distribution: Unknown" >&2
-        exit 1
-    fi
-
-    # Read /etc/os-release to identify the Linux distribution
-    # shellcheck disable=SC1091
-    source /etc/os-release
-
-    # Ubuntu and other Debian-derivatives should be treated as Debian
-    if [ "${ID_LIKE:-}" = debian ]; then
-        ADJUSTED_ID=debian
+    
+    if [ "$AIDER_VERSION" = latest ]; then
+        echo "Installing latest Aider..."
+        su -c 'pipx install aider-chat' "$USERNAME"
     else
-        ADJUSTED_ID="${ID:-}"
+        echo "Installing Aider version $AIDER_VERSION..."
+        su -c "pipx install aider-chat==${AIDER_VERSION}" "$USERNAME"
     fi
 
-    case "$ADJUSTED_ID" in
-        debian|ubuntu)
-            install_debian
-            ;;
-        *)
-            echo "Unsupported distribution: $ADJUSTED_ID" >&2
-            exit 1
-            ;;
-    esac
-
-    clean_up
-
     echo "Aider has been installed!"
 }
 

test/aider/scenarios.json

@@ -9,12 +9,6 @@
       },
       "remoteUser": "octocat"
   },
-  "with_ubuntu": {
-      "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
-      "features": {
-          "aider": {}
-      }
-  },
   "with_version": {
       "image": "mcr.microsoft.com/devcontainers/base:debian",
       "features": {

test/aider/test.sh

@@ -35,6 +35,7 @@ set -e
 # Optional: Import test library bundled with the devcontainer CLI
 # See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
 # Provides the 'check' and 'reportResults' commands.
+# shellcheck disable=SC1091
 source dev-container-features-test-lib
 
 # Feature-specific tests

test/aider/with_ubuntu.sh

@@ -6,10 +6,12 @@
 set -e
 
 # Optional: Import test library bundled with the devcontainer CLI
+# shellcheck disable=SC1091
 source dev-container-features-test-lib
 
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib.
+# shellcheck disable=SC2016
 check "execute command" bash -c 'aider --version && [ $(whoami) = octocat ]'
 
 # Report result

test/aider/with_username.sh

@@ -6,6 +6,7 @@
 set -e
 
 # Optional: Import test library bundled with the devcontainer CLI
+# shellcheck disable=SC1091
 source dev-container-features-test-lib
 
 # Feature-specific tests