aws-lambda-layer-cli 1.4.1 → 2.0.1

package/README.md

@@ -17,7 +17,7 @@ A command-line tool for creating and publishing AWS Lambda layers for Node.js an
 
 ## Installation
 
-### Package managers (recommended)
+### Package Managers (Recommended)
 
 These installs do **not** write to `/usr/local` and do **not** require `sudo`.
 
@@ -25,28 +25,30 @@ These installs do **not** write to `/usr/local` and do **not** require `sudo`.
 
 ```bash
 npm i -g aws-lambda-layer-cli
-aws-lambda-layer --help
+aws-lambda-layer-cli --help
 ```
 
 #### pip (Python)
 
 ```bash
 python -m pip install --user aws-lambda-layer-cli
-aws-lambda-layer --help
+aws-lambda-layer-cli --help
 ```
 
 #### uv (Python)
 
 ```bash
 uv tool install aws-lambda-layer-cli
-aws-lambda-layer --help
+aws-lambda-layer-cli --help
 ```
 
-### Linux/macOS
+### Native Installation
+
+#### Linux/macOS
 
 ```bash
 # Clone or download the repository
-git clone <repository-url>
+git clone https://github.com/yukcw/aws-lambda-layer-cli.git
 cd aws-lambda-layer-cli
 
 # Run installation script (requires sudo)
@@ -54,13 +56,13 @@ sudo ./scripts/install.sh
 ```
 
 The installation will:
-- Copy scripts to `/usr/local/lib/aws-lambda-layer`
+- Copy scripts to `/usr/local/lib/aws-lambda-layer-cli`
 - Create a symlink in `/usr/local/bin` for global access
 - Install shell completions for bash and zsh
 
-### Windows
+#### Windows
 
-#### Option 1: PowerShell (Recommended)
+##### Option 1: PowerShell
 
 ```powershell
 # One-liner installation
@@ -78,11 +80,11 @@ Invoke-WebRequest -Uri "https://raw.githubusercontent.com/yukcw/aws-lambda-layer
 ```
 
 This will:
-- Download the tool to `%USERPROFILE%\.aws-lambda-layer`
+- Download the tool to `%USERPROFILE%\.aws-lambda-layer-cli`
 - Add it to your PATH
 - Create Windows wrapper scripts
 
-#### Option 2: Manual Installation
+##### Option 2: Manual Installation
 
 1. Install prerequisites:
    - [Git for Windows](https://gitforwindows.org/) (includes Git Bash)
@@ -148,7 +150,7 @@ If you encounter issues:
    - Restart PowerShell/Command Prompt after installation
 
 2. **"No such file or directory"**
-   - Try running: `bash "$env:USERPROFILE\.aws-lambda-layer\aws-lambda-layer" --help`
+   - Try running: `bash "$env:USERPROFILE\.aws-lambda-layer-cli\aws-lambda-layer-cli" --help`
    - Or reinstall: `powershell -ExecutionPolicy ByPass -c "irm https://raw.githubusercontent.com/yukcw/aws-lambda-layer-cli/main/scripts/install.ps1 | iex"`
 
 3. **Permission issues**

package/bin/aws-lambda-layer-cli.js

@@ -0,0 +1,183 @@
+#!/usr/bin/env node
+
+'use strict';
+
+const { spawnSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+
+function which(cmd) {
+  const isWin = process.platform === 'win32';
+  const exts = isWin ? (process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM').split(';') : [''];
+  const paths = (process.env.PATH || '').split(path.delimiter);
+
+  for (const p of paths) {
+    if (!p) continue;
+    for (const ext of exts) {
+      const full = path.join(p, isWin ? cmd + ext.toLowerCase() : cmd);
+      if (fs.existsSync(full)) return full;
+      // Also check original case on Windows
+      const full2 = path.join(p, cmd + ext);
+      if (fs.existsSync(full2)) return full2;
+    }
+  }
+  return null;
+}
+
+function shQuote(s) {
+  // Single-quote for bash -lc
+  return `'${String(s).replace(/'/g, `'\\''`)}'`;
+}
+
+function windowsPathToWsl(p) {
+  // C:\Users\me\x -> /mnt/c/Users/me/x
+  const m = /^([a-zA-Z]):\\(.*)$/.exec(p);
+  if (!m) return null;
+  return `/mnt/${m[1].toLowerCase()}/${m[2].replace(/\\/g, '/')}`;
+}
+
+function cygpathConvert(mode, p) {
+  const cygpath = which('cygpath');
+  if (!cygpath) return null;
+  const res = spawnSync(cygpath, [mode, p], { encoding: 'utf8' });
+  if (res.status !== 0) return null;
+  return (res.stdout || '').trim();
+}
+
+function run(cmd, args) {
+  const res = spawnSync(cmd, args, { stdio: 'inherit' });
+  process.exit(res.status ?? 1);
+}
+
+const args = process.argv.slice(2);
+
+if (args[0] === 'completion') {
+  const hasZsh = args.includes('--zsh');
+  const hasBash = args.includes('--bash');
+  
+  if (args.includes('--help') || args.includes('-h') || (!hasZsh && !hasBash)) {
+    const GREEN = '\x1b[0;32m';
+    const YELLOW = '\x1b[0;33m';
+    const BLUE = '\x1b[0;34m';
+    const MAGENTA = '\x1b[0;35m';
+    const NC = '\x1b[0m';
+    const UNDERLINE = '\x1b[4m';
+
+    console.log(`${BLUE}Usage:${NC}`);
+    console.log(`  aws-lambda-layer-cli ${GREEN}completion${NC} [options]`);
+    console.log('');
+    console.log(`${BLUE}Options:${NC}`);
+    console.log(`  ${YELLOW}--zsh${NC}     Output zsh completion script`);
+    console.log(`  ${YELLOW}--bash${NC}    Output bash completion script`);
+    console.log('');
+    console.log(`${MAGENTA}${UNDERLINE}Examples:${NC}`);
+    console.log('  # Load completion in current shell');
+    console.log(`  source <(aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--bash${NC})`);
+    console.log('');
+    console.log('  # Add to .zshrc');
+    console.log(`  aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--zsh${NC} >> ~/.zshrc`);
+    process.exit(0);
+  }
+
+  const completionDir = path.resolve(__dirname, '..', 'completion');
+  let shell = '';
+
+  if (hasZsh) {
+    shell = 'zsh';
+  } else if (hasBash) {
+    shell = 'bash';
+  }
+
+  if (shell === 'zsh') {
+    const file = path.join(completionDir, 'aws-lambda-layer-completion.zsh');
+    if (fs.existsSync(file)) {
+      let content = fs.readFileSync(file, 'utf8');
+      // Remove the auto-execution line if present, to make it safe for sourcing
+      content = content.replace(/_aws-lambda-layer-cli "\$@"\s*$/, '');
+      console.log(content);
+      console.log('\n# Register completion');
+      console.log('if type compdef &>/dev/null; then');
+      console.log('  compdef _aws-lambda-layer-cli aws-lambda-layer-cli');
+      console.log('fi');
+    } else {
+      console.error('Completion script not found for zsh');
+      process.exit(1);
+    }
+  } else {
+    // bash
+    const file = path.join(completionDir, 'aws-lambda-layer-completion.bash');
+    if (fs.existsSync(file)) {
+      console.log(fs.readFileSync(file, 'utf8'));
+    } else {
+      console.error('Completion script not found for bash');
+      process.exit(1);
+    }
+  }
+  process.exit(0);
+}
+
+if (args[0] === 'uninstall') {
+  if (args.includes('--help') || args.includes('-h')) {
+    const GREEN = '\x1b[0;32m';
+    const BLUE = '\x1b[0;34m';
+    const NC = '\x1b[0m';
+    
+    console.log(`${BLUE}Usage:${NC}`);
+    console.log(`  aws-lambda-layer-cli ${GREEN}uninstall${NC}`);
+    console.log('');
+    console.log(`${BLUE}Description:${NC}`);
+    console.log('  Uninstalls the AWS Lambda Layer CLI tool and removes all associated files.');
+    console.log('  This includes:');
+    console.log('  - The CLI executable and symlinks');
+    console.log('  - The installation directory');
+    console.log('  - Shell completion scripts');
+    process.exit(0);
+  }
+
+  const uninstallScript = path.resolve(__dirname, '..', 'scripts', 'uninstall.js');
+  if (fs.existsSync(uninstallScript)) {
+    run(process.execPath, [uninstallScript, ...args.slice(1)]);
+  } else {
+    console.error('Uninstall script not found');
+    process.exit(1);
+  }
+  return;
+}
+
+const bashScript = path.resolve(__dirname, '..', 'scripts', 'aws-lambda-layer-cli');
+
+if (!fs.existsSync(bashScript)) {
+  console.error('Error: packaged bash script not found:', bashScript);
+  process.exit(1);
+}
+
+// POSIX platforms
+if (process.platform !== 'win32') {
+  run('bash', [bashScript, ...args]);
+}
+
+// Windows platforms:
+// - Prefer Git Bash / MSYS / Cygwin: convert to POSIX path using cygpath -u
+// - Else attempt WSL: convert to /mnt/<drive>/... and run via wsl.exe
+// - Else give a clear message
+
+const posixPath = cygpathConvert('-u', bashScript);
+if (posixPath) {
+  run('bash', [posixPath, ...args]);
+}
+
+const wsl = which('wsl.exe') || which('wsl');
+if (wsl) {
+  const wslPath = windowsPathToWsl(bashScript);
+  if (!wslPath) {
+    console.error('Error: unable to convert path for WSL:', bashScript);
+    process.exit(1);
+  }
+
+  const cmd = `bash ${shQuote(wslPath)} ${args.map(shQuote).join(' ')}`.trim();
+  run(wsl, ['bash', '-lc', cmd]);
+}
+
+console.error('Error: no compatible bash found on Windows.');
+console.error('Install and run this tool inside WSL, or install Git Bash and ensure `bash`/`cygpath` are on PATH.');
+process.exit(1);

package/completion/aws-lambda-layer-completion.bash

@@ -1,8 +1,12 @@
-# bash completion for aws-lambda-layer
+# bash completion for aws-lambda-layer-cli
 
-_aws_lambda_layer() {
+_aws_lambda_layer_cli() {
     local cur prev words cword
-    _init_completion || return
+    # Use fallback variables for older bash versions
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    words=("${COMP_WORDS[@]}")
+    cword=$COMP_CWORD
 
     local commands="zip publish help --help --version"
     local runtime_opts="--nodejs --node -n --python --py -p --runtime"
@@ -98,4 +102,4 @@ _aws_lambda_layer() {
     esac
 }
 
-complete -F _aws_lambda_layer aws-lambda-layer
+complete -F _aws_lambda_layer_cli aws-lambda-layer-cli

package/completion/aws-lambda-layer-completion.zsh

@@ -1,6 +1,6 @@
-#compdef aws-lambda-layer
+#compdef aws-lambda-layer-cli
 
-_aws-lambda-layer() {
+_aws-lambda-layer-cli() {
     local -a commands runtime_opts common_opts node_opts python_opts
     
     commands=(
@@ -107,4 +107,4 @@ _aws-lambda-layer() {
     esac
 }
 
-_aws-lambda-layer "$@"
+# _aws-lambda-layer-cli "$@"

package/package.json

@@ -1,7 +1,19 @@
 {
   "name": "aws-lambda-layer-cli",
-  "version": "1.4.1",
+  "version": "2.0.1",
   "description": "CLI tool for creating and publishing AWS Lambda layers for Node.js and Python.",
+  "keywords": [
+    "aws",
+    "lambda",
+    "nodejs",
+    "serverless",
+    "amazon",
+    "cli",
+    "zip",
+    "publish",
+    "layer",
+    "tools"
+  ],
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -13,10 +25,12 @@
   "homepage": "https://github.com/yukcw/aws-lambda-layer-cli#readme",
   "scripts": {
     "sync-version": "node scripts/sync_version.js",
-    "prepublishOnly": "npm run sync-version"
+    "prepublishOnly": "npm run sync-version",
+    "postinstall": "node scripts/install.js",
+    "preuninstall": "node scripts/uninstall.js"
   },
   "bin": {
-    "aws-lambda-layer": "bin/aws-lambda-layer.js"
+    "aws-lambda-layer-cli": "bin/aws-lambda-layer-cli.js"
   },
   "engines": {
     "node": ">=18"

package/scripts/{aws-lambda-layer → aws-lambda-layer-cli}

@@ -2,7 +2,7 @@
 
 # AWS Lambda Layer CLI Tool
 # Install: sudo ./scripts/install.sh
-# Usage: aws-lambda-layer zip --nodejs express,axios -n my-layer
+# Usage: aws-lambda-layer-cli zip --nodejs express,axios -n my-layer
 
 set -e
 set -u
@@ -26,7 +26,7 @@ STRIKETHROUGH='\033[9m'
 
 # Paths
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-INSTALL_DIR="/usr/local/lib/aws-lambda-layer"
+INSTALL_DIR="/usr/local/lib/aws-lambda-layer-cli"
 
 # Determine script locations (prefer relative to script, fallback to global install)
 if [ -f "$SCRIPT_DIR/create_nodejs_layer.sh" ]; then
@@ -54,16 +54,18 @@ show_help() {
     printf "${BLUE}${BOLD}AWS Lambda Layer CLI Tool - ${version}${NC}\n\n"
     
     printf "${BLUE}Usage:${NC}\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--python${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--python${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}help${NC}\n"
-    printf "  aws-lambda-layer [options]\n\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--python${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--python${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}help${NC}\n"
+    printf "  aws-lambda-layer-cli [options]\n\n"
     
     printf "${BLUE}Commands:${NC}\n"
     printf "  ${GREEN}zip${NC}            Create and package a Lambda layer as zip file\n"
     printf "  ${GREEN}publish${NC}        Create and publish a Lambda layer to AWS (uses IAM credentials)\n"
+    printf "  ${GREEN}completion${NC}     Generate shell completion scripts\n"
+    printf "  ${GREEN}uninstall${NC}      Uninstall the tool and remove all files\n"
     printf "  ${GREEN}help${NC}           Show this help message\n\n"
     
     printf "${BLUE}Runtime Options:${NC}\n"
@@ -89,12 +91,12 @@ show_help() {
     printf "  Python:     numpy==1.26.0, pandas>=2.1.0, requests~=2.31.0\n\n"
     
     printf "${MAGENTA}${UNDERLINE}Examples:${NC}\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} express,lodash\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--python${NC} \"numpy==1.26.0,pandas>=2.1.0\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--description${NC} \"Express layer\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--python${NC} numpy==1.26.0 ${YELLOW}--description${NC} \"NumPy layer\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} date-fns,uuid ${YELLOW}--name${NC} utility-layer ${YELLOW}--description${NC} \"Utility packages\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--profile${NC} production ${YELLOW}--region${NC} ap-east-1 ${YELLOW}--description${NC} \"Express layer\"\n\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} express,lodash\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--python${NC} \"numpy==1.26.0,pandas>=2.1.0\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--description${NC} \"Express layer\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--python${NC} numpy==1.26.0 ${YELLOW}--description${NC} \"NumPy layer\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} date-fns,uuid ${YELLOW}--name${NC} utility-layer ${YELLOW}--description${NC} \"Utility packages\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--profile${NC} production ${YELLOW}--region${NC} ap-east-1 ${YELLOW}--description${NC} \"Express layer\"\n\n"
     
     printf "${YELLOW}${BOLD}Requirements for publish command:${NC}\n"
     printf "  - AWS CLI installed and configured\n"
@@ -458,7 +460,12 @@ handle_publish() {
     done
     
     # Parse runtime flag from remaining arguments
-    set -- "${new_args[@]}"
+    if [ ${#new_args[@]} -eq 0 ]; then
+        set --
+    else
+        set -- "${new_args[@]}"
+    fi
+
     case "${1:-}" in
         --nodejs|--node|-n)
             runtime="nodejs"
@@ -753,6 +760,86 @@ handle_publish() {
     printf "📁 Zip file saved: ${CYAN}$output_dir/$zip_file${NC}\n"
 }
 
+# Handle completion command
+handle_completion() {
+    local shell=""
+    local show_help=false
+    
+    if [ $# -eq 0 ]; then
+        show_help=true
+    fi
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --zsh)
+                shell="zsh"
+                shift
+                ;;
+            --bash)
+                shell="bash"
+                shift
+                ;;
+            --help|-h)
+                show_help=true
+                shift
+                ;;
+            *)
+                shift
+                ;;
+        esac
+    done
+    
+    if [ "$show_help" = true ] || [ -z "$shell" ]; then
+        printf "${BLUE}Usage:${NC}\n"
+        printf "  aws-lambda-layer-cli ${GREEN}completion${NC} [options]\n\n"
+        printf "${BLUE}Options:${NC}\n"
+        printf "  ${YELLOW}--zsh${NC}     Output zsh completion script\n"
+        printf "  ${YELLOW}--bash${NC}    Output bash completion script\n\n"
+        printf "${MAGENTA}${UNDERLINE}Examples:${NC}\n"
+        printf "  # Load completion in current shell\n"
+        printf "  source <(aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--bash${NC})\n\n"
+        printf "  # Add to .zshrc\n"
+        printf "  aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--zsh${NC} >> ~/.zshrc\n"
+        return 0
+    fi
+    
+    # Find completion directory
+    # If running from source: ../completion
+    # If installed: $INSTALL_DIR/completion
+    local completion_dir=""
+    if [ -d "$SCRIPT_DIR/../completion" ]; then
+        completion_dir="$SCRIPT_DIR/../completion"
+    elif [ -d "$INSTALL_DIR/completion" ]; then
+        completion_dir="$INSTALL_DIR/completion"
+    else
+        printf "${RED}Error: Completion directory not found${NC}\n" >&2
+        return 1
+    fi
+    
+    if [ "$shell" = "zsh" ]; then
+        local file="$completion_dir/aws-lambda-layer-completion.zsh"
+        if [ -f "$file" ]; then
+            # Remove the auto-execution line if present
+            sed 's/_aws-lambda-layer "\$@"//g' "$file"
+            printf "\n# Register completion\n"
+            printf "if type compdef &>/dev/null; then\n"
+            printf "  compdef _aws-lambda-layer aws-lambda-layer\n"
+            printf "fi\n"
+        else
+            printf "${RED}Error: Completion script not found for zsh${NC}\n" >&2
+            return 1
+        fi
+    else
+        local file="$completion_dir/aws-lambda-layer-completion.bash"
+        if [ -f "$file" ]; then
+            cat "$file"
+        else
+            printf "${RED}Error: Completion script not found for bash${NC}\n" >&2
+            return 1
+        fi
+    fi
+}
+
 # Function to convert file paths for compatibility across environments
 convert_path() {
     local input_path="$1"
@@ -786,6 +873,25 @@ convert_path() {
     esac
 }
 
+# Handle uninstall
+handle_uninstall() {
+    local uninstall_script="$SCRIPT_DIR/uninstall.sh"
+    
+    # Check if uninstall script exists in script dir
+    if [ ! -f "$uninstall_script" ]; then
+        # Check install dir
+        uninstall_script="$INSTALL_DIR/uninstall.sh"
+    fi
+    
+    if [ -f "$uninstall_script" ]; then
+        exec "$uninstall_script" "$@"
+    else
+        printf "${RED}Error: Uninstall script not found${NC}\n" >&2
+        printf "Please run the uninstall script manually or remove the installation directory.\n" >&2
+        exit 1
+    fi
+}
+
 # Main command parsing
 main() {
     if [ $# -eq 0 ]; then
@@ -802,6 +908,14 @@ main() {
             shift
             handle_publish "$@"
             ;;
+        uninstall)
+            shift
+            handle_uninstall "$@"
+            ;;
+        completion)
+            shift
+            handle_completion "$@"
+            ;;
         help|--help|-h)
             show_help
             ;;
@@ -809,9 +923,9 @@ main() {
             show_version
             ;;
         *)
-            printf "${RED}Error: Unknown command '$1'${NC}\n"
-            printf "Available commands: zip, publish\n"
-            printf "Use --help for more information\n"
+            printf "${RED}Error: Unknown command '$1'${NC}\n" >&2
+            printf "Available commands: zip, publish\n" >&2
+            printf "Use --help for more information\n" >&2
             exit 1
             ;;
     esac

package/scripts/build_pypi.sh

@@ -5,6 +5,7 @@ set -e
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 BUILD_DIR="$BASE_DIR/aws_lambda_layer_cli"
 ASSETS_DIR="$BUILD_DIR/assets"
+COMPLETION_DIR="$BUILD_DIR/completion"
 
 echo "Preparing PyPI package structure..."
 
@@ -13,6 +14,7 @@ rm -rf "$BUILD_DIR" "$BASE_DIR/dist" "$BASE_DIR/build" "$BASE_DIR/aws_lambda_lay
 
 # Create package directories
 mkdir -p "$ASSETS_DIR"
+mkdir -p "$COMPLETION_DIR"
 
 # Copy Python package files
 cp "$BASE_DIR/scripts/pypi_resources/__init__.py" "$BUILD_DIR/"
@@ -20,18 +22,24 @@ cp "$BASE_DIR/scripts/pypi_resources/cli.py" "$BUILD_DIR/"
 cp "$BASE_DIR/VERSION.txt" "$BUILD_DIR/"
 
 # Copy assets (bash scripts)
-cp "$BASE_DIR/scripts/aws-lambda-layer" "$ASSETS_DIR/"
+cp "$BASE_DIR/scripts/aws-lambda-layer-cli" "$ASSETS_DIR/"
 cp "$BASE_DIR/scripts/create_nodejs_layer.sh" "$ASSETS_DIR/"
 cp "$BASE_DIR/scripts/create_python_layer.sh" "$ASSETS_DIR/"
+cp "$BASE_DIR/scripts/uninstall.sh" "$ASSETS_DIR/"
 
-# Create __init__.py for assets package
+# Copy completion files
+cp "$BASE_DIR/completion/aws-lambda-layer-completion.bash" "$COMPLETION_DIR/"
+cp "$BASE_DIR/completion/aws-lambda-layer-completion.zsh" "$COMPLETION_DIR/"
+
+# Create __init__.py for assets and completion packages
 touch "$ASSETS_DIR/__init__.py"
+touch "$COMPLETION_DIR/__init__.py"
 
 echo "Building PyPI package..."
 cd "$BASE_DIR"
 python3 -m build
 
 echo "Cleaning up temporary package files..."
-rm -rf "$BUILD_DIR" "$BASE_DIR/aws_lambda_layer_cli.egg-info" "$BASE_DIR/build"
+# rm -rf "$BUILD_DIR" "$BASE_DIR/aws_lambda_layer_cli.egg-info" "$BASE_DIR/build"
 
 echo "Build complete! Artifacts are in dist/"

package/scripts/install.js

@@ -3,32 +3,70 @@ const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const readline = require('readline');
 
-try {
-  const isWindows = os.platform() === 'win32';
-  const scriptPath = isWindows ? path.join('scripts', 'install.ps1') : path.join('scripts', 'install.sh');
-  const fullPath = path.join(__dirname, '..', scriptPath);
+const isWindows = os.platform() === 'win32';
+const scriptPath = isWindows ? path.join('scripts', 'install.ps1') : path.join('scripts', 'install.sh');
+const fullPath = path.join(__dirname, '..', scriptPath);
 
-  if (!fs.existsSync(fullPath)) {
-    console.error(`Installation script not found: ${fullPath}`);
+if (!fs.existsSync(fullPath)) {
+  console.error(`Installation script not found: ${fullPath}`);
+  process.exit(1);
+}
+
+function runInstall(useSudo) {
+  try {
+    const cmd = useSudo ? `sudo bash "${fullPath}"` : `bash "${fullPath}"`;
+    execSync(cmd, { stdio: 'inherit' });
+    console.log('✓ Installation completed successfully');
+    process.exit(0);
+  } catch (error) {
+    console.error('✗ Installation failed:', error.message);
     process.exit(1);
   }
+}
 
-  if (isWindows) {
-    // Run PowerShell script with proper execution policy
+if (isWindows) {
+  try {
     execSync(`powershell -ExecutionPolicy Bypass -File "${fullPath}"`, {
       stdio: 'inherit',
       shell: true
     });
+    console.log('✓ Installation completed successfully');
+  } catch (error) {
+    console.error('✗ Installation failed:', error.message);
+    process.exit(1);
+  }
+} else {
+  const isRoot = process.getuid && process.getuid() === 0;
+
+  if (isRoot) {
+    console.log('Running installation with root privileges...');
+    runInstall(false);
   } else {
-    // Run bash script
-    execSync(`bash "${fullPath}"`, {
-      stdio: 'inherit'
+    console.log('Installation requires root privileges for system-wide components...');
+    // Check if interactive
+    if (!process.stdin.isTTY) {
+      console.log('Non-interactive environment detected. Skipping system-wide installation steps requiring sudo.');
+      process.exit(0);
+    }
+
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    console.log('\nThis package includes optional system-wide components (shell completion, helper scripts).');
+    console.log('Installing them requires root privileges (sudo).');
+    
+    rl.question('Do you want to install these components? [y/N] ', (answer) => {
+      rl.close();
+      if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+        runInstall(true);
+      } else {
+        console.log('Skipping system-wide installation.');
+        process.exit(0);
+      }
     });
   }
-  
-  console.log('✓ Installation completed successfully');
-} catch (error) {
-  console.error('✗ Installation failed:', error.message);
-  process.exit(1);
 }

package/scripts/install.ps1

@@ -9,7 +9,7 @@
     This tool requires Windows Subsystem for Linux (WSL) or Git Bash.
 
 .PARAMETER InstallDir
-    Directory where the tool will be installed (default: $env:USERPROFILE\.aws-lambda-layer)
+    Directory where the tool will be installed (default: $env:USERPROFILE\.aws-lambda-layer-cli)
 
 .PARAMETER Force
     Force reinstallation even if already installed
@@ -35,15 +35,15 @@ param(
 # Set default InstallDir if not provided
 if ([string]::IsNullOrEmpty($InstallDir)) {
     if ($env:USERPROFILE) {
-        $InstallDir = "$env:USERPROFILE\.aws-lambda-layer"
+        $InstallDir = "$env:USERPROFILE\.aws-lambda-layer-cli"
     } else {
-        $InstallDir = "$env:HOME/.aws-lambda-layer"
+        $InstallDir = "$env:HOME/.aws-lambda-layer-cli"
     }
 }
 
 # Configuration
 $RepoUrl = "https://github.com/yukcw/aws-lambda-layer-cli"
-$ToolName = "aws-lambda-layer"
+$ToolName = "aws-lambda-layer-cli"
 $Version = "1.4.1" # Fallback version
 
 # Colors for output
@@ -426,7 +426,7 @@ function Install-Tool {
     )
 
     $scripts = @(
-        "aws-lambda-layer",
+        "aws-lambda-layer-cli",
         "create_nodejs_layer.sh",
         "create_python_layer.sh",
         "uninstall.sh",
@@ -586,7 +586,7 @@ if %ERRORLEVEL% EQU 0 (
     REM Try to run with bash
     bash "!UNIX_PATH!/$ToolName" %*
     if !ERRORLEVEL! NEQ 0 (
-        echo Error: Failed to execute aws-lambda-layer
+        echo Error: Failed to execute aws-lambda-layer-cli
         echo Please check that the script exists and is executable
         echo Script path: !UNIX_PATH!/$ToolName
         pause
@@ -618,17 +618,17 @@ function Show-PostInstall {
     Write-ColorOutput "  $InstallDir" $Cyan
     Write-ColorOutput ""
     Write-ColorOutput "Usage examples:" $Magenta
-    Write-Host "  aws-lambda-layer " -NoNewline -ForegroundColor $White
+    Write-Host "  aws-lambda-layer-cli " -NoNewline -ForegroundColor $White
     Write-Host "zip " -NoNewline -ForegroundColor $Green
     Write-Host "--nodejs " -NoNewline -ForegroundColor $Yellow
     Write-Host """express@^4.0.0,lodash@~4.17.0""" -ForegroundColor $White
-    Write-Host "  aws-lambda-layer " -NoNewline -ForegroundColor $White
+    Write-Host "  aws-lambda-layer-cli " -NoNewline -ForegroundColor $White
     Write-Host "zip " -NoNewline -ForegroundColor $Green
     Write-Host "--python " -NoNewline -ForegroundColor $Yellow
     Write-Host """numpy==1.26.0,pandas>=2.1.0""" -ForegroundColor $White
     Write-ColorOutput ""
     Write-ColorOutput "For more information:" $Yellow
-    Write-Host "  aws-lambda-layer " -NoNewline -ForegroundColor $White
+    Write-Host "  aws-lambda-layer-cli " -NoNewline -ForegroundColor $White
     Write-ColorOutput "help" $Green
 
     Write-ColorOutput ""

package/scripts/install.sh

@@ -24,7 +24,11 @@ printf "${CYAN}${BOLD}Installing AWS Lambda Layer CLI Tool...${NC}\n"
 # Check if running as root
 if [ "$EUID" -ne 0 ]; then 
     if command -v sudo &> /dev/null; then
-        printf "${YELLOW}Warning: Not running as root. Using sudo for installation.${NC}\n"
+        # Check if we need a password
+        if ! sudo -n true 2>/dev/null; then
+            printf "${YELLOW}This script requires root privileges to install to /usr/local/lib.${NC}\n"
+            printf "${YELLOW}Please enter your password if prompted.${NC}\n"
+        fi
         SUDO="sudo"
     else
         SUDO=""
@@ -36,7 +40,7 @@ fi
 # Get script directory
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 BASE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-INSTALL_DIR="/usr/local/lib/aws-lambda-layer"
+INSTALL_DIR="/usr/local/lib/aws-lambda-layer-cli"
 BIN_DIR="/usr/local/bin"
 COMPLETION_DIR="/etc/bash_completion.d"
 
@@ -46,29 +50,36 @@ $SUDO mkdir -p "$INSTALL_DIR"
 
 # Copy scripts
 printf "${BLUE}Copying scripts...${NC}\n"
-$SUDO cp "$SCRIPT_DIR/aws-lambda-layer" "$INSTALL_DIR/"
+$SUDO cp "$SCRIPT_DIR/aws-lambda-layer-cli" "$INSTALL_DIR/"
 $SUDO cp "$SCRIPT_DIR/create_nodejs_layer.sh" "$INSTALL_DIR/"
 $SUDO cp "$SCRIPT_DIR/create_python_layer.sh" "$INSTALL_DIR/"
+$SUDO cp "$SCRIPT_DIR/uninstall.sh" "$INSTALL_DIR/"
 $SUDO cp "$BASE_DIR/VERSION.txt" "$INSTALL_DIR/"
 
+# Copy completion files for the CLI to use
+printf "${BLUE}Copying completion files...${NC}\n"
+$SUDO mkdir -p "$INSTALL_DIR/completion"
+$SUDO cp "$BASE_DIR/completion/aws-lambda-layer-completion.bash" "$INSTALL_DIR/completion/"
+$SUDO cp "$BASE_DIR/completion/aws-lambda-layer-completion.zsh" "$INSTALL_DIR/completion/"
+
 # Make scripts executable
 printf "${BLUE}Setting executable permissions...${NC}\n"
-$SUDO chmod +x "$INSTALL_DIR/aws-lambda-layer"
+$SUDO chmod +x "$INSTALL_DIR/aws-lambda-layer-cli"
 $SUDO chmod +x "$INSTALL_DIR/create_nodejs_layer.sh"
 $SUDO chmod +x "$INSTALL_DIR/create_python_layer.sh"
 
 # Create symlink in bin directory
 printf "${BLUE}Creating symlink in $BIN_DIR...${NC}\n"
-$SUDO ln -sf "$INSTALL_DIR/aws-lambda-layer" "$BIN_DIR/aws-lambda-layer"
+$SUDO ln -sf "$INSTALL_DIR/aws-lambda-layer-cli" "$BIN_DIR/aws-lambda-layer-cli"
 
 # Install bash completion
 printf "${BLUE}Installing bash completion...${NC}\n"
 if [ -d "$COMPLETION_DIR" ]; then
-    $SUDO cp "$BASE_DIR/completion/aws-lambda-layer-completion.bash" "$COMPLETION_DIR/aws-lambda-layer"
+    $SUDO cp "$BASE_DIR/completion/aws-lambda-layer-completion.bash" "$COMPLETION_DIR/aws-lambda-layer-cli"
     # Source the completion script
     if [ -f "$HOME/.bashrc" ]; then
-        if ! grep -q "aws-lambda-layer" "$HOME/.bashrc"; then
-            printf "\n# AWS Lambda Layer CLI completion\nsource $COMPLETION_DIR/aws-lambda-layer\n" >> "$HOME/.bashrc"
+        if ! grep -q "aws-lambda-layer-cli" "$HOME/.bashrc"; then
+            printf "\n# AWS Lambda Layer CLI completion\nsource $COMPLETION_DIR/aws-lambda-layer-cli\n" >> "$HOME/.bashrc"
         fi
     fi
     printf "${GREEN}Bash completion installed.${NC}\n"
@@ -92,14 +103,14 @@ else
 fi
 
 if [ -n "$ZSH_COMPLETION_DIR" ]; then
-    $SUDO cp "$BASE_DIR/completion/aws-lambda-layer-completion.zsh" "$ZSH_COMPLETION_DIR/_aws-lambda-layer"
+    $SUDO cp "$BASE_DIR/completion/aws-lambda-layer-completion.zsh" "$ZSH_COMPLETION_DIR/_aws-lambda-layer-cli"
     printf "${GREEN}Zsh completion installed to: $ZSH_COMPLETION_DIR${NC}\n"
 fi
 
 printf "${GREEN}${BOLD}✅ Installation complete!${NC}\n\n"
 printf "${MAGENTA}${UNDERLINE}Usage examples:${NC}\n"
-printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} \"express@^4.0.0,lodash@~4.17.0\"\n"
-printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--python${NC} \"numpy==1.26.0,pandas>=2.1.0\"\n\n"
+printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} \"express@^4.0.0,lodash@~4.17.0\"\n"
+printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--python${NC} \"numpy==1.26.0,pandas>=2.1.0\"\n\n"
 printf "${YELLOW}To enable tab completion, restart your shell:${NC}\n"
 printf "  For bash: source ~/.bashrc\n"
 printf "  For zsh:  exec zsh\n\n"

package/scripts/pypi_resources/cli.py

@@ -49,12 +49,100 @@ def main() -> None:
     else:
         assets_dir = Path(__file__).resolve().parent / "assets"
 
-    script_path = assets_dir / "aws-lambda-layer"
+    script_path = assets_dir / "aws-lambda-layer-cli"
     if not script_path.exists():
         raise SystemExit(f"Packaged script missing: {script_path}")
 
     args = sys.argv[1:]
 
+    # Handle uninstall command
+    if args and args[0] == "uninstall":
+        if "--help" in args or "-h" in args:
+            GREEN = '\033[0;32m'
+            BLUE = '\033[0;34m'
+            NC = '\033[0m'
+            
+            print(f"{BLUE}Usage:{NC}")
+            print(f"  aws-lambda-layer-cli {GREEN}uninstall{NC}")
+            print("")
+            print(f"{BLUE}Description:{NC}")
+            print("  Uninstalls the AWS Lambda Layer CLI tool and removes all associated files.")
+            print("  This includes:")
+            print("  - The CLI executable and symlinks")
+            print("  - The installation directory")
+            print("  - Shell completion scripts")
+            raise SystemExit(0)
+
+        uninstall_script = assets_dir / "uninstall.sh"
+        if not uninstall_script.exists():
+            raise SystemExit(f"Uninstall script missing: {uninstall_script}")
+        
+        # Use the same execution logic as the main script, but pointing to uninstall.sh
+        script_path = uninstall_script
+        # Remove 'uninstall' from args
+        args = args[1:]
+
+    # Handle completion command
+    if args and args[0] == "completion":
+        has_zsh = "--zsh" in args
+        has_bash = "--bash" in args
+        
+        if "--help" in args or "-h" in args or (not has_zsh and not has_bash):
+            GREEN = '\033[0;32m'
+            YELLOW = '\033[0;33m'
+            BLUE = '\033[0;34m'
+            MAGENTA = '\033[0;35m'
+            NC = '\033[0m'
+            UNDERLINE = '\033[4m'
+
+            print(f"{BLUE}Usage:{NC}")
+            print(f"  aws-lambda-layer-cli {GREEN}completion{NC} [options]")
+            print("")
+            print(f"{BLUE}Options:{NC}")
+            print(f"  {YELLOW}--zsh{NC}     Output zsh completion script")
+            print(f"  {YELLOW}--bash{NC}    Output bash completion script")
+            print("")
+            print(f"{MAGENTA}{UNDERLINE}Examples:{NC}")
+            print("  # Load completion in current shell")
+            print(f"  source <(aws-lambda-layer-cli {GREEN}completion{NC} {YELLOW}--bash{NC})")
+            print("")
+            print("  # Add to .zshrc")
+            print(f"  aws-lambda-layer-cli {GREEN}completion{NC} {YELLOW}--zsh{NC} >> ~/.zshrc")
+            raise SystemExit(0)
+
+        completion_dir = assets_dir.parent / "completion"
+        shell = ""
+        
+        if has_zsh:
+            shell = "zsh"
+        elif has_bash:
+            shell = "bash"
+            
+        if shell == "zsh":
+            file = completion_dir / "aws-lambda-layer-completion.zsh"
+            if file.exists():
+                content = file.read_text(encoding="utf-8")
+                # Remove the auto-execution line if present
+                import re
+                content = re.sub(r'_aws-lambda-layer-cli "\$@"\s*$', "", content)
+                print(content)
+                print("\n# Register completion")
+                print("if type compdef &>/dev/null; then")
+                print("  compdef _aws-lambda-layer-cli aws-lambda-layer-cli")
+                print("fi")
+            else:
+                print("Completion script not found for zsh", file=sys.stderr)
+                raise SystemExit(1)
+        else:
+            # bash
+            file = completion_dir / "aws-lambda-layer-completion.bash"
+            if file.exists():
+                print(file.read_text(encoding="utf-8"))
+            else:
+                print("Completion script not found for bash", file=sys.stderr)
+                raise SystemExit(1)
+        raise SystemExit(0)
+
     # POSIX
     if os.name != "nt":
         raise SystemExit(_run(["bash", str(script_path), *args]))

package/scripts/uninstall.js

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+try {
+  const isWindows = os.platform() === 'win32';
+  const scriptPath = isWindows ? path.join('scripts', 'uninstall.ps1') : path.join('scripts', 'uninstall.sh');
+  const fullPath = path.join(__dirname, '..', scriptPath);
+  const args = process.argv.slice(2).map(arg => `"${arg}"`).join(' ');
+
+  if (!fs.existsSync(fullPath)) {
+    console.error(`Uninstallation script not found: ${fullPath}`);
+    process.exit(1);
+  }
+
+  if (isWindows) {
+    // Run PowerShell script with proper execution policy
+    execSync(`powershell -ExecutionPolicy Bypass -File "${fullPath}" ${args}`, {
+      stdio: 'inherit',
+      shell: true
+    });
+  } else {
+    // Check if we are root
+    const isRoot = process.getuid && process.getuid() === 0;
+    
+    if (!isRoot) {
+      console.log('This script requires root privileges to uninstall from /usr/local/lib.');
+      console.log('Requesting sudo permissions...');
+      // Run with sudo directly from node
+      execSync(`sudo bash "${fullPath}" ${args}`, {
+        stdio: 'inherit'
+      });
+    } else {
+      // Already root, just run it
+      execSync(`bash "${fullPath}" ${args}`, {
+        stdio: 'inherit'
+      });
+    }
+  }
+  
+  console.log('✓ Uninstallation completed successfully');
+} catch (error) {
+  console.error('✗ Uninstallation failed:', error.message);
+  process.exit(1);
+}

package/scripts/uninstall.ps1

@@ -8,7 +8,7 @@
     Uninstalls the AWS Lambda Layer CLI tool from Windows systems.
 
 .PARAMETER InstallDir
-    Directory where the tool is installed (default: $env:USERPROFILE\.aws-lambda-layer)
+    Directory where the tool is installed (default: $env:USERPROFILE\.aws-lambda-layer-cli)
 
 .PARAMETER Force
     Force uninstallation without confirmation
@@ -34,9 +34,9 @@ param(
 # Determine InstallDir if not provided
 if ([string]::IsNullOrEmpty($InstallDir)) {
     if ($env:USERPROFILE) {
-        $InstallDir = Join-Path $env:USERPROFILE ".aws-lambda-layer"
+        $InstallDir = Join-Path $env:USERPROFILE ".aws-lambda-layer-cli"
     } elseif ($env:HOME) {
-        $InstallDir = Join-Path $env:HOME ".aws-lambda-layer"
+        $InstallDir = Join-Path $env:HOME ".aws-lambda-layer-cli"
     } else {
         Write-Error "Could not determine home directory. Please specify -InstallDir."
         exit 1
@@ -75,7 +75,7 @@ function Test-Installation {
         return $false
     }
 
-    $mainScript = Join-Path $InstallDir "aws-lambda-layer"
+    $mainScript = Join-Path $InstallDir "aws-lambda-layer-cli"
     if (-not (Test-Path $mainScript)) {
         Write-ColorOutput "Main script not found: $mainScript" $Yellow
         Write-ColorOutput "This doesn't look like a valid installation." $White
@@ -140,6 +140,26 @@ function Show-PostUninstall {
 function Main {
     Write-Header
 
+    # Check NPM
+    if (Get-Command npm -ErrorAction SilentlyContinue) {
+        $npmList = npm list -g aws-lambda-layer-cli --depth=0 2>$null
+        if ($npmList -match "aws-lambda-layer-cli@") {
+            Write-ColorOutput "Detected NPM installation." $Yellow
+            Write-ColorOutput "Removing NPM package..." $White
+            npm uninstall -g aws-lambda-layer-cli
+        }
+    }
+
+    # Check PyPI
+    if (Get-Command pip -ErrorAction SilentlyContinue) {
+        pip show aws-lambda-layer-cli 2>$null | Out-Null
+        if ($LASTEXITCODE -eq 0) {
+            Write-ColorOutput "Detected PyPI installation." $Yellow
+            Write-ColorOutput "Removing PyPI package..." $White
+            pip uninstall -y aws-lambda-layer-cli
+        }
+    }
+
     # Check if tool is installed
     $isInstalled = Test-Installation
     if (-not $isInstalled) {

package/scripts/uninstall.sh

@@ -11,23 +11,77 @@ YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
 NC='\033[0m'
 
+# Check for help flag
+if [[ "${1:-}" == "--help" || "${1:-}" == "-h" ]]; then
+    printf "${BLUE}Usage:${NC}\n"
+    printf "  aws-lambda-layer-cli ${GREEN}uninstall${NC}\n\n"
+    printf "${BLUE}Description:${NC}\n"
+    printf "  Uninstalls the AWS Lambda Layer CLI tool and removes all associated files.\n"
+    printf "  This includes:\n"
+    printf "  - The CLI executable and symlinks\n"
+    printf "  - The installation directory (/usr/local/lib/aws-lambda-layer-cli)\n"
+    printf "  - Shell completion scripts\n"
+    exit 0
+fi
+
 printf "${RED}Uninstalling AWS Lambda Layer CLI Tool...${NC}\n"
 
+# Check for other installation sources
+printf "\n${BLUE}Checking installation sources...${NC}\n"
+
+# Check NPM
+if command -v npm &> /dev/null; then
+    if npm list -g aws-lambda-layer-cli --depth=0 &> /dev/null; then
+        printf "${YELLOW}Detected NPM installation.${NC}\n"
+        printf "  Removing NPM package...\n"
+        npm uninstall -g aws-lambda-layer-cli
+    fi
+fi
+
+# Check PyPI (pip)
+if command -v pip &> /dev/null || command -v pip3 &> /dev/null; then
+    # Try pip then pip3
+    PIP_CMD="pip"
+    if ! command -v pip &> /dev/null; then
+        PIP_CMD="pip3"
+    fi
+    
+    if $PIP_CMD show aws-lambda-layer-cli &> /dev/null; then
+        printf "${YELLOW}Detected PyPI installation.${NC}\n"
+        printf "  Removing PyPI package...\n"
+        $PIP_CMD uninstall -y aws-lambda-layer-cli
+    fi
+fi
+
+# Check Native (System)
+if [ -d "/usr/local/lib/aws-lambda-layer-cli" ]; then
+    printf "${YELLOW}Detected Native/System installation.${NC}\n"
+    printf "  Proceeding with removal of system files...\n"
+else
+    printf "No Native/System installation found at /usr/local/lib/aws-lambda-layer-cli.\n"
+fi
+
+printf "\n"
+
 # Check if running as root
 if [ "$EUID" -ne 0 ]; then 
-    printf "${YELLOW}Warning: Not running as root. Using sudo for uninstallation.${NC}\n"
+    # Check if we need a password (sudo -n true returns 0 if we have access, 1 if we need password)
+    if ! sudo -n true 2>/dev/null; then
+        printf "${YELLOW}This script requires root privileges to uninstall from /usr/local/lib.${NC}\n"
+        printf "${YELLOW}Please enter your password if prompted.${NC}\n"
+    fi
     SUDO="sudo"
 else
     SUDO=""
 fi
 
-INSTALL_DIR="/usr/local/lib/aws-lambda-layer"
+INSTALL_DIR="/usr/local/lib/aws-lambda-layer-cli"
 BIN_DIR="/usr/local/bin"
 COMPLETION_DIR="/etc/bash_completion.d"
 
 # Remove symlink
 printf "${BLUE}Removing symlink...${NC}\n"
-$SUDO rm -f "$BIN_DIR/aws-lambda-layer"
+$SUDO rm -f "$BIN_DIR/aws-lambda-layer-cli"
 
 # Remove installation directory
 printf "${BLUE}Removing installation directory...${NC}\n"
@@ -35,24 +89,24 @@ $SUDO rm -rf "$INSTALL_DIR"
 
 # Remove bash completion
 printf "${BLUE}Removing bash completion...${NC}\n"
-$SUDO rm -f "$COMPLETION_DIR/aws-lambda-layer"
+$SUDO rm -f "$COMPLETION_DIR/aws-lambda-layer-cli"
 
 # Remove zsh completion
-if [ -f "/usr/local/share/zsh/site-functions/_aws-lambda-layer" ]; then
+if [ -f "/usr/local/share/zsh/site-functions/_aws-lambda-layer-cli" ]; then
     printf "${BLUE}Removing zsh completion (standard)...${NC}\n"
-    $SUDO rm -f "/usr/local/share/zsh/site-functions/_aws-lambda-layer"
+    $SUDO rm -f "/usr/local/share/zsh/site-functions/_aws-lambda-layer-cli"
 fi
 
-if [ -f "/opt/homebrew/share/zsh/site-functions/_aws-lambda-layer" ]; then
+if [ -f "/opt/homebrew/share/zsh/site-functions/_aws-lambda-layer-cli" ]; then
     printf "${BLUE}Removing zsh completion (Homebrew)...${NC}\n"
-    $SUDO rm -f "/opt/homebrew/share/zsh/site-functions/_aws-lambda-layer"
+    $SUDO rm -f "/opt/homebrew/share/zsh/site-functions/_aws-lambda-layer-cli"
 fi
 
 # Remove from .bashrc
 if [ -f "$HOME/.bashrc" ]; then
     printf "${BLUE}Cleaning up .bashrc...${NC}\n"
     $SUDO sed -i '/# AWS Lambda Layer CLI completion/d' "$HOME/.bashrc"
-    $SUDO sed -i '/source.*aws-lambda-layer/d' "$HOME/.bashrc"
+    $SUDO sed -i '/source.*aws-lambda-layer-cli/d' "$HOME/.bashrc"
 fi
 
 printf "${GREEN}✅ Uninstallation complete!${NC}\n"

package/bin/aws-lambda-layer.js

@@ -1,89 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const { spawnSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-
-function which(cmd) {
-  const isWin = process.platform === 'win32';
-  const exts = isWin ? (process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM').split(';') : [''];
-  const paths = (process.env.PATH || '').split(path.delimiter);
-
-  for (const p of paths) {
-    if (!p) continue;
-    for (const ext of exts) {
-      const full = path.join(p, isWin ? cmd + ext.toLowerCase() : cmd);
-      if (fs.existsSync(full)) return full;
-      // Also check original case on Windows
-      const full2 = path.join(p, cmd + ext);
-      if (fs.existsSync(full2)) return full2;
-    }
-  }
-  return null;
-}
-
-function shQuote(s) {
-  // Single-quote for bash -lc
-  return `'${String(s).replace(/'/g, `'\\''`)}'`;
-}
-
-function windowsPathToWsl(p) {
-  // C:\Users\me\x -> /mnt/c/Users/me/x
-  const m = /^([a-zA-Z]):\\(.*)$/.exec(p);
-  if (!m) return null;
-  return `/mnt/${m[1].toLowerCase()}/${m[2].replace(/\\/g, '/')}`;
-}
-
-function cygpathConvert(mode, p) {
-  const cygpath = which('cygpath');
-  if (!cygpath) return null;
-  const res = spawnSync(cygpath, [mode, p], { encoding: 'utf8' });
-  if (res.status !== 0) return null;
-  return (res.stdout || '').trim();
-}
-
-function run(cmd, args) {
-  const res = spawnSync(cmd, args, { stdio: 'inherit' });
-  process.exit(res.status ?? 1);
-}
-
-const args = process.argv.slice(2);
-const bashScript = path.resolve(__dirname, '..', 'scripts', 'aws-lambda-layer');
-
-if (!fs.existsSync(bashScript)) {
-  console.error('Error: packaged bash script not found:', bashScript);
-  process.exit(1);
-}
-
-// POSIX platforms
-if (process.platform !== 'win32') {
-  run('bash', [bashScript, ...args]);
-}
-
-// Windows platforms:
-// - Prefer Git Bash / MSYS / Cygwin: convert to POSIX path using cygpath -u
-// - Else attempt WSL: convert to /mnt/<drive>/... and run via wsl.exe
-// - Else give a clear message
-
-const posixPath = cygpathConvert('-u', bashScript);
-if (posixPath) {
-  run('bash', [posixPath, ...args]);
-}
-
-const wsl = which('wsl.exe') || which('wsl');
-if (wsl) {
-  const wslPath = windowsPathToWsl(bashScript);
-  if (!wslPath) {
-    console.error('Error: unable to convert path for WSL:', bashScript);
-    process.exit(1);
-  }
-
-  const cmd = `bash ${shQuote(wslPath)} ${args.map(shQuote).join(' ')}`.trim();
-  run(wsl, ['bash', '-lc', cmd]);
-}
-
-console.error('Error: no compatible bash found on Windows.');
-console.error('Install and run this tool inside WSL, or install Git Bash and ensure `bash`/`cygpath` are on PATH.');
-process.exit(1);