Consistent naming

Author: chrmarti

scripts/install.sh

@@ -7,7 +7,7 @@
 #
 # Options:
 #   --prefix DIR        Installation directory (default: ~/.devcontainers)
-#   --version VER       CLI version to install (default: latest)
+#   --version VER       Dev Containers CLI version to install (default: latest)
 #   --node-version VER  Node.js major version (default: 20)
 #   --update            Update existing installation to latest versions
 #   --uninstall         Remove the installation
@@ -59,15 +59,15 @@ error() {
 # Print usage information
 usage() {
     cat << 'EOF'
-Install @devcontainers/cli with bundled Node.js
+Install the Dev Containers CLI with bundled Node.js
 
 Usage:
   curl -fsSL https://raw.githubusercontent.com/devcontainers/cli/main/scripts/install.sh | sh
   sh install.sh [OPTIONS]
 
 Options:
   --prefix DIR        Installation directory (default: ~/.devcontainers)
-  --version VER       CLI version to install (default: latest)
+  --version VER       Dev Containers CLI version to install (default: latest)
   --node-version VER  Node.js major version (default: 20)
   --update            Update existing installation to latest versions
   --uninstall         Remove the installation
@@ -259,16 +259,16 @@ fetch() {
 # Resolve "latest" CLI version from npm registry
 resolve_cli_version() {
     if [ "$CLI_VERSION" = "latest" ]; then
-        say "Resolving latest CLI version..."
+        say "Resolving latest Dev Containers CLI version..."
         version=$(fetch "https://registry.npmjs.org/@devcontainers/cli/latest" | \
             sed -n 's/.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -1)
         if [ -z "$version" ]; then
-            error "Failed to resolve latest CLI version from npm registry"
+            error "Failed to resolve latest Dev Containers CLI version from npm registry"
             exit 1
         fi
         CLI_VERSION="$version"
     fi
-    say "CLI version: $CLI_VERSION"
+    say "Dev Containers CLI version: $CLI_VERSION"
 }
 
 # Resolve full Node.js version from major version
@@ -376,9 +376,9 @@ install_cli() {
 
     # Check if already installed
     if [ -d "$version_dir/package" ] && [ -f "$version_dir/package/devcontainer.js" ]; then
-        say "CLI v$CLI_VERSION is already installed"
+        say "Dev Containers CLI v$CLI_VERSION is already installed"
     else
-        say "Downloading CLI v$CLI_VERSION..."
+        say "Downloading Dev Containers CLI v$CLI_VERSION..."
 
         tmp_dir=$(mktemp -d)
         trap 'rm -rf "$tmp_dir"' EXIT
@@ -388,7 +388,7 @@ install_cli() {
 
         download "$cli_url" "$tarball"
 
-        say "Extracting CLI..."
+        say "Extracting Dev Containers CLI..."
         mkdir -p "$version_dir"
         tar -xzf "$tarball" -C "$version_dir"
 
@@ -397,7 +397,7 @@ install_cli() {
     fi
 
     # Update current symlink
-    say "Activating CLI v$CLI_VERSION..."
+    say "Activating Dev Containers CLI v$CLI_VERSION..."
     ln -sfn "$CLI_VERSION" "$cli_dir/current"
 
     # Save metadata
@@ -415,7 +415,7 @@ create_wrapper() {
 
     cat > "$wrapper" << 'WRAPPER_EOF'
 #!/bin/sh
-# devcontainer CLI wrapper - generated by install.sh
+# Dev Containers CLI wrapper - generated by install.sh
 # https://github.com/devcontainers/cli
 
 set -e
@@ -447,7 +447,7 @@ fi
 
 # Verify CLI exists
 if [ ! -f "$CLI_ENTRY" ]; then
-    echo "Error: CLI not found at $CLI_ENTRY" >&2
+    echo "Error: Dev Containers CLI not found at $CLI_ENTRY" >&2
     echo "Installation may be corrupted. Please reinstall:" >&2
     echo "  curl -fsSL https://raw.githubusercontent.com/devcontainers/cli/main/scripts/install.sh | sh" >&2
     exit 1
@@ -474,7 +474,7 @@ verify_installation() {
     fi
 
     if [ ! -f "$cli_entry" ]; then
-        error "CLI entry point not found"
+        error "Dev Containers CLI entry point not found"
         exit 1
     fi
 
@@ -488,7 +488,7 @@ verify_installation() {
     if [ -n "$version" ]; then
         say "Installed: devcontainer $version"
     else
-        warn "Could not verify CLI version, but files are in place"
+        warn "Could not verify Dev Containers CLI version, but files are in place"
     fi
 }
 
@@ -531,7 +531,7 @@ do_update() {
     current_node=$(cat "$INSTALL_PREFIX/.metadata/node-version" 2>/dev/null || echo "unknown")
 
     say "Current installation:"
-    say "  CLI: v$current_cli"
+    say "  Dev Containers CLI: v$current_cli"
     say "  Node.js: v$current_node"
 
     # Resolve latest versions
@@ -541,9 +541,9 @@ do_update() {
 
     # Update components
     if [ "$current_cli" = "$CLI_VERSION" ]; then
-        say "CLI is already up to date"
+        say "Dev Containers CLI is already up to date"
     else
-        say "Updating CLI: v$current_cli -> v$CLI_VERSION"
+        say "Updating Dev Containers CLI: v$current_cli -> v$CLI_VERSION"
         install_cli
     fi
 
@@ -635,7 +635,7 @@ main() {
     parse_args "$@"
 
     echo ""
-    say "${BOLD}@devcontainers/cli installer${RESET}"
+    say "${BOLD}Dev Containers CLI installer${RESET}"
     echo ""
 
     # Handle uninstall

scripts/install.test.sh

@@ -152,7 +152,7 @@ test_help_flag() {
 
     output=$(sh "$INSTALL_SCRIPT" --help 2>&1) || true
 
-    assert_contains "$output" "Install @devcontainers/cli" "--help shows description"
+    assert_contains "$output" "Install the Dev Containers CLI" "--help shows description"
     assert_contains "$output" "--prefix" "--help shows --prefix option"
     assert_contains "$output" "--version" "--help shows --version option"
     assert_contains "$output" "--node-version" "--help shows --node-version option"
@@ -168,7 +168,7 @@ test_help_short_flag() {
     setup
 
     output=$(sh "$INSTALL_SCRIPT" -h 2>&1) || true
-    assert_contains "$output" "Install @devcontainers/cli" "-h shows help"
+    assert_contains "$output" "Install the Dev Containers CLI" "-h shows help"
 
     teardown
 }
@@ -419,7 +419,7 @@ test_wrapper_missing_cli() {
 
     output=$("$prefix/bin/devcontainer" --version 2>&1) && rc=0 || rc=$?
     assert_exit_code "1" "$rc" "wrapper exits 1 when CLI missing"
-    assert_contains "$output" "CLI not found" "wrapper reports missing CLI"
+    assert_contains "$output" "Dev Containers CLI not found" "wrapper reports missing Dev Containers CLI"
 
     teardown
 }