Move common-setup.sh from _lib/ to feature root, fix test runner

Author: abdurriq

SHARED_CODE.md

@@ -17,15 +17,15 @@ We maintain a **single source of truth** with a **sync mechanism** to deploy to
 
 ### Deployment
 - **Mechanism**: `scripts/sync-common-setup.sh`
-- **Target**: Copies to each feature's `_lib/` directory
+- **Target**: Copies to each feature's directory as `common-setup.sh`
 - **Reason**: Devcontainer packaging requires files to be within each feature's directory
 
 ## Workflow
 
 ### Making Changes
 
 1. **Edit the source**: Modify `scripts/lib/common-setup.sh`
-2. **Test**: Run `bash test/_lib/test-common-setup.sh`
+2. **Test**: Run `bash test/_global/test-common-setup.sh`
 3. **Sync**: Run `./scripts/sync-common-setup.sh`
 4. **Commit**: Include both source and deployed copies
 
@@ -34,13 +34,13 @@ We maintain a **single source of truth** with a **sync mechanism** to deploy to
 vim scripts/lib/common-setup.sh
 
 # Test
-bash test/_lib/test-common-setup.sh
+bash test/_global/test-common-setup.sh
 
 # Deploy to all features
 ./scripts/sync-common-setup.sh
 
 # Commit everything
-git add scripts/lib/common-setup.sh src/*/_lib/common-setup.sh
+git add scripts/lib/common-setup.sh src/*/common-setup.sh
 git commit -m "Update common-setup.sh helper function"
 ```
 
@@ -50,7 +50,7 @@ The sync script is idempotent - running it multiple times with the same source p
 
 ```bash
 # Check that all copies are identical
-for f in src/*/_lib/common-setup.sh; do
+for f in src/*/common-setup.sh; do
     diff -q scripts/lib/common-setup.sh "$f" || echo "MISMATCH: $f"
 done
 ```
@@ -81,14 +81,14 @@ The devcontainer spec has a proposal for an `include` property in `devcontainer-
 
 As of this PR:
 - **Source**: `scripts/lib/common-setup.sh` (87 lines)
-- **Deployed**: 17 features, each with `src/FEATURE/_lib/common-setup.sh`
+- **Deployed**: 16 features, each with `src/FEATURE/common-setup.sh`
 - **Sync Script**: `scripts/sync-common-setup.sh`
-- **Tests**: `test/_lib/test-common-setup.sh` (14 test cases)
+- **Tests**: `test/_global/test-common-setup.sh` (14 test cases)
 - **Benefits**: Eliminated ~188 lines of inline duplicated logic from install scripts
 
 ## References
 
 - [Devcontainer Spec Issue #129 - Share code between features](https://github.com/devcontainers/spec/issues/129)
 - [Features Library Proposal](https://github.com/devcontainers/spec/blob/main/proposals/features-library.md)
-- Test documentation: `test/_lib/README.md`
+- Test documentation: `test/_global/test-common-setup.sh`
 - Sync script documentation: `scripts/README.md`

scripts/README.md

@@ -19,21 +19,21 @@ scripts/
 
 ### Deploying Changes
 
-Due to the devcontainer CLI's packaging behavior (each feature is packaged independently), the helper must be deployed to each feature's `_lib/` directory. We maintain this through a sync script:
+Due to the devcontainer CLI's packaging behavior (each feature is packaged independently), the helper must be deployed to each feature's directory. We maintain this through a sync script:
 
 ```bash
 ./scripts/sync-common-setup.sh
 ```
 
 This copies `scripts/lib/common-setup.sh` to all features:
-- `src/anaconda/_lib/common-setup.sh`
-- `src/docker-in-docker/_lib/common-setup.sh`
+- `src/anaconda/common-setup.sh`
+- `src/docker-in-docker/common-setup.sh`
 - etc.
 
 ### Workflow
 
 1. **Edit**: Make changes to `scripts/lib/common-setup.sh`
-2. **Test**: Run `bash test/_lib/test-common-setup.sh` to verify
+2. **Test**: Run `bash test/_global/test-common-setup.sh` to verify
 3. **Sync**: Run `./scripts/sync-common-setup.sh` to deploy to all features
 4. **Commit**: Commit both the source and all copies together
 
@@ -48,10 +48,10 @@ Therefore, each feature needs its own copy of the helper to ensure it's availabl
 
 ## Testing
 
-Tests are located in `test/_lib/` and reference the anaconda feature's copy as the source:
+Tests are located in `test/_global/` and reference the source of truth directly:
 
 ```bash
-bash test/_lib/test-common-setup.sh
+bash test/_global/test-common-setup.sh
 ```
 
 ## Future

scripts/sync-common-setup.sh

@@ -4,7 +4,7 @@
 # Licensed under the MIT License. See https://github.com/devcontainers/features/blob/main/LICENSE for license information.
 #-------------------------------------------------------------------------------------------------------------------------
 #
-# Script to sync common-setup.sh from the source to all feature _lib directories
+# Script to sync common-setup.sh from the source to all feature directories
 # This maintains a single source of truth while deploying to each feature for packaging
 #
 # Usage: ./scripts/sync-common-setup.sh
@@ -51,16 +51,12 @@ fi
 UPDATED_COUNT=0
 
 for feature in "${FEATURES[@]}"; do
-    TARGET_DIR="${REPO_ROOT}/src/${feature}/_lib"
-    TARGET_FILE="${TARGET_DIR}/common-setup.sh"
-    
-    # Create _lib directory if it doesn't exist
-    mkdir -p "${TARGET_DIR}"
+    TARGET_FILE="${REPO_ROOT}/src/${feature}/common-setup.sh"
 
     # Copy the file
     cp "${SOURCE_FILE}" "${TARGET_FILE}"
 
-    echo "✓ Synced to src/${feature}/_lib/common-setup.sh"
+    echo "✓ Synced to src/${feature}/common-setup.sh"
     UPDATED_COUNT=$((UPDATED_COUNT + 1))
 done
 
@@ -71,5 +67,5 @@ echo "Updated ${UPDATED_COUNT} features"
 echo "======================================"
 echo ""
 echo "Note: After running this script, commit the changes:"
-echo "  git add src/*/lib/common-setup.sh"
+echo "  git add src/*/common-setup.sh"
 echo "  git commit -m 'Sync common-setup.sh to all features'"

src/anaconda/_lib/common-setup.sh

@@ -83,7 +83,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/_lib/common-setup.sh"
+source "${SCRIPT_DIR}/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")

src/anaconda/install.sh

@@ -29,7 +29,7 @@ chmod +x /etc/profile.d/00-restore-env.sh
 
 # Source common helper functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "${SCRIPT_DIR}/_lib/common-setup.sh"
+source "${SCRIPT_DIR}/common-setup.sh"
 
 # Determine the appropriate non-root user
 USERNAME=$(determine_user_from_input "${USERNAME}" "root")