setup-kapelu 3.2.10 → 3.2.11

package/cli.js

@@ -1,10 +1,14 @@
 #!/usr/bin/env node
 
 const { execSync } = require("child_process");
+const { existsSync } = require("fs");
 const pkg = require("./package.json");
-const { clear } = require("console");
 
-function exists(cmd) {
+function run(cmd, options = {}) {
+  execSync(cmd, { stdio: "inherit", shell: "/bin/bash", ...options });
+}
+
+function commandExists(cmd) {
   try {
     execSync(`command -v ${cmd}`, { stdio: "ignore" });
     return true;
@@ -13,78 +17,50 @@ function exists(cmd) {
   }
 }
 
-function installNode() {
-  console.log("📦 Instalando Node.js y npm...\n");
-  execSync("sudo apt update", { stdio: "inherit" });
-  execSync("sudo apt install -y nodejs npm", { stdio: "inherit" });
-}
-
-function latestVersion() {
-  try {
-    return execSync(`npm view ${pkg.name} version`, {
-      stdio: ["ignore", "pipe", "ignore"],
-    })
-      .toString()
-      .trim();
-  } catch {
-    return null;
+function ensureNode() {
+  if (!commandExists("node") || !commandExists("npm")) {
+    console.log("📦 Node.js y npm no detectados. Instalando...");
+    run(
+      "curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash",
+    );
+    run(
+      'export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"',
+    );
+    run("nvm install --lts && nvm use --lts");
+    run("npm install -g pnpm yarn");
+  } else {
+    console.log("✔ Node.js y npm OK");
   }
 }
 
-function updateIfNeeded() {
-  const current = pkg.version;
-  const latest = latestVersion();
-  if (!latest) return;
-
-  if (current !== latest) {
-    console.log(`⬆ Nueva versión disponible ${latest} (actual ${current})`);
-    console.log("Actualizando kapelu...\n");
-    execSync(`npm install -g ${pkg.name}`, { stdio: "inherit" });
+function updateKapelu() {
+  const latest = execSync(`npm view ${pkg.name} version`, {
+    stdio: ["ignore", "pipe", "ignore"],
+  })
+    .toString()
+    .trim();
+  if (pkg.version !== latest) {
+    console.log(`⬆ Nueva versión disponible: ${latest}. Actualizando...`);
+    run(`npm install -g ${pkg.name}`);
     process.exit(0);
   }
 }
 
-function autoUpdateGitHub() {
-  // Si el script existe, hacer pull del repo para tener versión más reciente
-  try {
-    execSync(
-      `if [ -d "/tmp/script-setup" ]; then cd /tmp/script-setup && git pull --rebase; fi`,
-      { stdio: "inherit", shell: "/bin/bash" },
-    );
-  } catch {}
-}
-
 try {
-  console.log("🔎 Verificando Node.js y npm...");
-  if (!exists("node") || !exists("npm")) installNode();
-  console.log("✔ Node.js y npm OK\n");
-
-  console.log("🔎 Verificando actualizaciones en npm...");
-  updateIfNeeded();
+  console.log("🔎 Verificando Node/npm...");
+  ensureNode();
 
-  console.log("🔎 Actualizando desde GitHub si existe repo local...");
-  autoUpdateGitHub();
+  console.log("🔎 Verificando actualizaciones...");
+  updateKapelu();
 
-  console.log("🚀 Ejecutando install.sh\n");
-  execSync(`bash ${__dirname}/install.sh`, { stdio: "inherit" });
+  console.log("🚀 Ejecutando instalador completo...");
+  run(`bash ${__dirname}/install.sh`);
 } catch (err) {
   console.clear();
-
-  console.error("\n❌ Error ejecutando Post-Install\n");
-
-  if (err.status) {
-    console.error("Código de salida:", err.status);
-  }
-
-  if (err.cmd) {
-    console.error("Comando:", err.cmd);
-  }
-
-  if (err.stderr) {
-    console.error(err.stderr.toString());
-  }
-
+  console.error("\n❌ Error ejecutando setup-kapelu\n");
+  if (err.status) console.error("Código de salida:", err.status);
+  if (err.cmd) console.error("Comando:", err.cmd);
+  if (err.stderr) console.error(err.stderr.toString());
   console.error(err.message);
-
   process.exit(1);
-}
+}

package/install.sh

@@ -1,112 +1,107 @@
 #!/usr/bin/env bash
 # ╔════════════════════════════════════════════════════╗
-# │ setup-kapelu installer completo Ubuntu             │
+# │ Install - Script Post-Install Todo en Uno          │
+# │ Versión: 3.2.9                                     │
 # │ Autor: Daniel Calderon - Kapelu                    │
-# │ Fecha: 14/03/2026                                  │
+# │ Fecha: 04/03/2026                                  │
+# │ WebSite: https://danielcalderon.vercel.app/        │
+# │ Github: https://github.com/Kapelu                  │
 # ╚════════════════════════════════════════════════════╝
 
 set -Eeuo pipefail
 IFS=$'\n\t'
 
-GREEN='\e[32m'
-RESET='\e[0m'
-
 USER_NAME=$(whoami)
-HOME_DIR="$HOME"
+HOME_DIR=$HOME
 DESKTOP_DIR=$(xdg-user-dir DESKTOP)
 TMP_DIR="/tmp/kape-setup-$RANDOM"
 REPO="https://github.com/Kapelu/kape-setup.git"
+LOG="$HOME/setup-kapelu.log"
+green='\e[32m'
+reset='\e[0m'
 
-log() { echo -e "${GREEN}✅ $1${RESET}"; }
+log() {
+    echo -e "${green}✅ $1${reset}"
+    echo "$1" >> "$LOG"
+}
 
-# 1️⃣ Detectar distro
+# Detectar distro soportada
 detect_distro() {
-  if [[ -f /etc/os-release ]]; then
-    . /etc/os-release
-  else
-    echo "❌ No se puede detectar la distro"
-    exit 1
-  fi
-  case "$ID" in
-    ubuntu|debian|linuxmint|pop)
-      log "Distribución soportada: $ID"
-      ;;
-    *)
-      echo "❌ Distro no soportada: $ID"
-      exit 1
-      ;;
-  esac
+    if [ ! -f /etc/os-release ]; then
+        log "Sistema no soportado"
+        exit 1
+    fi
+
+    source /etc/os-release
+    case "$ID" in
+        ubuntu|debian|linuxmint|pop)
+            log "Distribución detectada: $ID"
+        ;;
+        *)
+            log "Distribución no soportada: $ID"
+            exit 1
+        ;;
+    esac
 }
 
-# 2️⃣ Actualizar sistema
-system_update() {
-  log "Actualizando sistema..."
-  sudo apt update -y
-  sudo apt upgrade -y
-  sudo apt install -y curl git build-essential xdg-utils
+# Instalar git si no existe
+check_git() {
+    if ! command -v git >/dev/null; then
+        log "Instalando git"
+        sudo apt update
+        sudo apt install -y git
+    fi
 }
 
-# 3️⃣ Instalar NVM + Node LTS
-install_node() {
-  log "Instalando NVM..."
-  export NVM_DIR="$HOME/.nvm"
-  if [ ! -d "$NVM_DIR" ]; then
-    curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
-  fi
-  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-
-  log "Instalando Node LTS..."
-  nvm install --lts
-  nvm use --lts
-  nvm alias default 'lts/*'
-
-  log "Node $(node -v) y npm $(npm -v) listos"
+# Dar permisos a scripts con shebang
+permits() {
+    while IFS= read -r -d '' file; do
+        if head -n1 "$file" | grep -q "^#!"; then
+            chmod +x "$file"
+        fi
+    done < <(find . -type f -print0)
 }
 
-# 4️⃣ Instalar setup-kapelu globalmente
-install_kapelu() {
-  log "Instalando setup-kapelu globalmente..."
-  npm install -g setup-kapelu
-  if command -v kapelu >/dev/null 2>&1; then
-    log "setup-kapelu instalado correctamente"
-  else
-    echo "❌ Error instalando setup-kapelu"
-    exit 1
-  fi
+backup_bashrc() {
+    if [ -f "$HOME_DIR/.bashrc" ]; then
+        cp "$HOME_DIR/.bashrc" "$HOME_DIR/.bashrc.backup.$(date +%s)"
+        log "Backup de .bashrc creado"
+    fi
 }
 
-# 5️⃣ Clonar repositorio temporal
+# Clonar repo temporal
 clone_repo() {
-  log "Clonando repositorio..."
-  git clone -b main "$REPO" "$TMP_DIR"
+    log "Clonando repositorio"
+    git clone -b main "$REPO" "$TMP_DIR"
 }
 
-# 6️⃣ Copiar scripts y dar permisos
+# Copiar scripts al home
 copy_scripts() {
-  mkdir -p "$HOME_DIR/script"
-  cp -r "$TMP_DIR/script/." "$HOME_DIR/script/"
-  find "$HOME_DIR/script" -type f -exec chmod +x {} \;
+    mkdir -p "$HOME_DIR/script"
+    cp -r "$TMP_DIR/script/." "$HOME_DIR/script/"
+    find "$HOME_DIR/script" -type f -name "*.sh" -exec chmod +x {} \;
 }
 
-# 7️⃣ Copiar configuración
+# Copiar configs
 copy_config() {
-  cp "$TMP_DIR/config/.bashrc" "$HOME_DIR/.bashrc"
-  cp "$TMP_DIR/config/protect-main.json" "$HOME_DIR/"
+    cp "$TMP_DIR/config/.bashrc" "$HOME_DIR/.bashrc"
+    cp "$TMP_DIR/config/protect-main.json" "$HOME_DIR/"
 }
 
-# 8️⃣ Crear accesos directos en escritorio
+# Crear accesos directos en el escritorio
 create_desktop() {
-  mkdir -p "$DESKTOP_DIR"
-  DATA=(
-    "log|Logout|Cierra sesión en 10 segundos|system-log-out"
-    "shd|Apagar|Apaga la PC en 10 segundos|system-shutdown"
-    "sus|Suspender|Suspende la PC en 10 segundos|system-suspend"
-  )
-  for row in "${DATA[@]}"; do
-    IFS="|" read -r id name comment icon <<< "$row"
-    file="$DESKTOP_DIR/btn_${id}.desktop"
-    cat <<EOF > "$file"
+    mkdir -p "$DESKTOP_DIR"
+
+    DATA=(
+        "log|Logout|Cierra sesión en 10 segundos|system-log-out"
+        "shd|Apagar|Apaga la PC en 10 segundos|system-shutdown"
+        "sus|Suspender|Suspende la PC en 10 segundos|system-suspend"
+    )
+
+    for row in "${DATA[@]}"; do
+        IFS="|" read -r id name comment icon <<< "$row"
+        file="$DESKTOP_DIR/btn_${id}.desktop"
+        cat <<EOF > "$file"
 [Desktop Entry]
 Name=$name
 Comment=$comment
@@ -116,41 +111,54 @@ Terminal=false
 Type=Application
 Categories=Utility;
 EOF
-    chmod +x "$file"
-    gio set "$file" metadata::trusted true
-  done
-  killall -q nautilus 2>/dev/null || true
+        chmod +x "$file"
+        gio set "$file" metadata::trusted true
+    done
+
+    killall -q nautilus 2>/dev/null
 }
 
-# 9️⃣ Ejecutar setup.sh
+system_update() { sudo apt update -y; sudo apt upgrade -y; sudo apt full-upgrade -y; }
+system_cleanup() { sudo apt autoremove -y; sudo apt clean; }
+
+# Ejecutar setup.sh final
 run_setup() {
-  FILE="$HOME_DIR/script/setup.sh"
-  if [ ! -f "$FILE" ]; then
-    echo "❌ setup.sh no encontrado"
-    return 1
-  fi
-  chmod +x "$FILE"
-  "$FILE"
+    printf "${green}📦 ¿Desea ejecutar setup.sh? (s/n): ${reset}"
+    read RESP
+
+    if [ "$RESP" = "s" ]; then
+        FILE="$HOME_DIR/script/setup.sh"
+
+        if [ ! -f "$FILE" ]; then
+            echo "❌ Error: setup.sh no encontrado en $HOME_DIR/script/"
+            return 1
+        fi
+
+        if [ ! -x "$FILE" ]; then
+            chmod +x "$FILE"
+        fi
+
+        "$FILE"
+    else
+        system_update
+        system_cleanup
+    fi
 }
 
-#  🔟 Limpieza
-cleanup() {
-  rm -rf "$TMP_DIR"
-}
+cleanup() { rm -rf "$TMP_DIR"; }
 
-# ────────────── Main ──────────────
 main() {
-  detect_distro
-  system_update
-  install_node
-  install_kapelu
-  clone_repo
-  copy_scripts
-  copy_config
-  create_desktop
-  run_setup
-  cleanup
-  log "🎉 Secuencia Post-Install completada con éxito"
+    log "Iniciando Secuencia Post-Install setup-kapelu"
+
+    detect_distro
+    check_git
+    clone_repo
+    copy_scripts
+    backup_bashrc
+    copy_config
+    create_desktop
+    run_setup
+    cleanup
 }
 
 main

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-kapelu",
-  "version": "3.2.10",
+  "version": "3.2.11",
   "description": "Script post-install de Ubuntu",
   "type": "commonjs",
   "bin": {
@@ -33,5 +33,8 @@
   "bugs": {
     "url": "https://github.com/Kapelu/kape-setup/issues"
   },
-  "homepage": "https://github.com/Kapelu/kape-setup#readme"
+  "homepage": "https://github.com/Kapelu/kape-setup#readme",
+  "engines": {
+    "node": ">=18"
+  }
 }