aws-lambda-layer-cli 1.4.1 → 2.0.2

package/scripts/uninstall.sh

@@ -11,23 +11,86 @@ 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 uv
+if command -v uv &> /dev/null; then
+    if uv tool list | grep -q "aws-lambda-layer-cli"; then
+        printf "${YELLOW}Detected uv installation.${NC}\n"
+        printf "  Removing uv tool...\n"
+        uv tool uninstall 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 +98,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);