karnel-termux 4.11.2 → 4.11.3

package/karnel/cli/commands/update.sh

@@ -186,67 +186,96 @@ update_karnel() {
   separator
   echo
 
-  if [[ -d "$KARNEL_PATH/../.git" ]]; then
-    loading "Updating Karnel-Termux" _update_karnel_repo
-    local rc=$?
+  # Tries every method in order until one succeeds
+  _update_try_git && { _update_cleanup; return 0; }
+  _update_try_npm && { _update_cleanup; return 0; }
+  _update_try_npm_install && { _update_cleanup; return 0; }
+  _update_try_pnpm && { _update_cleanup; return 0; }
+  _update_try_curl && { _update_cleanup; return 0; }
 
-    echo
-    if [[ $rc -eq 0 ]]; then
-      log_success "Karnel-Termux updated"
-    elif [[ $rc -eq 2 ]]; then
-      log_success "Karnel-Termux is already up to date"
-    else
-      log_error "Failed to update via git"
-      _update_karnel_npm_fallback
-    fi
+  log_error "All update methods failed"
+  _update_show_manual
 
-    rm -f "$KARNEL_CACHE/new_version" "$KARNEL_CACHE/last_version_check"
-  elif command -v npm &>/dev/null && npm list -g karnel-termux &>/dev/null 2>&1; then
-    _update_karnel_npm
-  elif command -v pnpm &>/dev/null && pnpm list -g karnel-termux &>/dev/null 2>&1; then
-    _update_karnel_pnpm
-  else
-    log_warn "Karnel-Termux installation not detected"
-    _update_karnel_npm_fallback
-  fi
+  echo
+}
+
+_update_cleanup() {
+  rm -f "$KARNEL_CACHE/new_version" "$KARNEL_CACHE/last_version_check"
+}
 
+_update_try_git() {
+  [[ -d "$KARNEL_PATH/../.git" ]] || return 1
+  loading "Updating via git" _update_karnel_repo
+  local rc=$?
   echo
+  if [[ $rc -eq 0 ]]; then
+    log_success "Karnel-Termux updated via git"
+    source "$KARNEL_PATH/utils/env.sh" 2>/dev/null
+    local new_ver="$KARNEL_VERSION"
+    log_success "Version: v$new_ver"
+    return 0
+  elif [[ $rc -eq 2 ]]; then
+    log_success "Karnel-Termux is already up to date"
+    return 0
+  fi
+  log_error "Git update failed"
+  return 1
 }
 
-_update_karnel_npm() {
-  log_info "Updating via npm..."
-  if npm update -g karnel-termux 2>&1; then
+_update_try_npm() {
+  command -v npm &>/dev/null || return 1
+  log_info "Trying npm update..."
+  if npm update -g karnel-termux 2>/dev/null; then
     local new_ver
     new_ver=$(npm list -g karnel-termux 2>/dev/null | grep karnel-termux | grep -oP '@\K[0-9.]+' || echo "latest")
-    log_success "Karnel-Termux updated to $new_ver"
-  else
-    log_error "npm update failed"
-    log_info "Try: npm install -g karnel-termux@latest"
+    log_success "Updated to v$new_ver via npm"
+    return 0
   fi
+  log_info "npm update not available, trying npm install..."
+  return 1
 }
 
-_update_karnel_pnpm() {
-  log_info "Updating via pnpm..."
-  if pnpm update -g karnel-termux 2>&1; then
-    log_success "Karnel-Termux updated via pnpm"
-  else
-    log_error "pnpm update failed"
-    _update_karnel_npm_fallback
+_update_try_npm_install() {
+  command -v npm &>/dev/null || return 1
+  log_info "Trying npm install..."
+  if npm install -g karnel-termux@latest 2>/dev/null; then
+    local new_ver
+    new_ver=$(npm list -g karnel-termux 2>/dev/null | grep karnel-termux | grep -oP '@\K[0-9.]+' || echo "latest")
+    log_success "Updated to v$new_ver via npm install"
+    return 0
   fi
+  return 1
 }
 
-_update_karnel_npm_fallback() {
-  log_info "Trying npm update as fallback..."
-  if command -v npm &>/dev/null; then
-    npm update -g karnel-termux 2>&1 || {
-      log_info "Try manually:"
-      echo "  npm install -g karnel-termux@latest"
-      echo "  curl -fsSL https://raw.githubusercontent.com/israelmarques1024-dotcom/karnel-termux/main/install.sh | bash"
-    }
-  else
-    log_info "Reinstall via curl:"
-    echo "  bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/israelmarques1024-dotcom/karnel-termux/main/install.sh)\""
+_update_try_pnpm() {
+  command -v pnpm &>/dev/null || return 1
+  log_info "Trying pnpm..."
+  if pnpm add -g karnel-termux@latest 2>/dev/null; then
+    log_success "Updated via pnpm"
+    return 0
   fi
+  return 1
+}
+
+_update_try_curl() {
+  command -v curl &>/dev/null || return 1
+  log_info "Trying curl reinstall..."
+  local tmp_install
+  tmp_install=$(mktemp)
+  if curl -fsSL "https://raw.githubusercontent.com/israelmarques1024-dotcom/karnel-termux/main/install.sh" -o "$tmp_install" 2>/dev/null; then
+    bash "$tmp_install" 2>/dev/null && { rm -f "$tmp_install"; log_success "Updated via curl"; return 0; }
+  fi
+  rm -f "$tmp_install"
+  return 1
+}
+
+_update_show_manual() {
+  log_info "Update manually with one of these:"
+  echo
+  echo "  npm install -g karnel-termux@latest"
+  echo "  pnpm add -g karnel-termux@latest"
+  echo "  bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/israelmarques1024-dotcom/karnel-termux/main/install.sh)\""
+  echo
 }
 
 _update_karnel_repo() {

package/karnel/cli/commands/upgrade.sh

@@ -9,61 +9,26 @@ upgrade_main() {
   separator
   echo
 
-  local karnel_root
-  karnel_root="$(cd "$KARNEL_PATH/.." && pwd 2>/dev/null || echo "")"
+  import "@/cli/commands/update"
+  update_karnel
 
-  if [[ -d "$karnel_root/.git" ]]; then
-    _upgrade_from_git "$karnel_root"
-  elif command -v npm &>/dev/null && npm list -g karnel-termux &>/dev/null 2>&1; then
-    _upgrade_from_npm
-  elif command -v pnpm &>/dev/null && pnpm list -g karnel-termux &>/dev/null 2>&1; then
-    _upgrade_from_pnpm
-  else
-    log_warn "Cannot detect installation method"
-    log_info "Reinstall via:"
-    list_item "npm:  npm install -g karnel-termux@latest"
-    list_item "curl: bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/israelmarques1024-dotcom/karnel-termux/main/install.sh)\""
-  fi
-}
-
-_upgrade_from_git() {
-  local karnel_root="$1"
-  log_info "Upgrading from git..."
-  if ! git -C "$karnel_root" pull origin main 2>/dev/null; then
-    log_warn "Git pull failed — check internet connection"
-    return 1
-  fi
-
-  log_success "Repository updated"
   source "$KARNEL_PATH/utils/env.sh" 2>/dev/null
-  log_success "Karnel v$KARNEL_VERSION"
+  log_success "Karnel upgraded to v$KARNEL_VERSION"
 
-  if [[ ! -L "$PREFIX/bin/karnel" ]] || [[ "$(readlink "$PREFIX/bin/karnel")" != "$KARNEL_PATH/bin/karnel" ]]; then
-    ln -sf "$KARNEL_PATH/bin/karnel" "$PREFIX/bin/karnel"
-    log_success "Symlink updated"
-  fi
+  _upgrade_fix_symlink
 
   echo
-  log_success "Karnel upgraded! Run 'karnel doctor' to verify."
+  log_info "Running cleanup..."
+  import "@/cli/commands/cleanup"
+  cleanup_main
+  echo
+  log_success "Karnel is up to date (v$KARNEL_VERSION)"
   echo
 }
 
-_upgrade_from_npm() {
-  log_info "Upgrading via npm..."
-  if npm install -g karnel-termux@latest 2>&1; then
-    local new_ver
-    new_ver=$(npm list -g karnel-termux 2>/dev/null | grep karnel-termux | grep -oP '@\K[0-9.]+')
-    log_success "Karnel upgraded to v$new_ver"
-  else
-    log_error "npm upgrade failed"
-  fi
-}
-
-_upgrade_from_pnpm() {
-  log_info "Upgrading via pnpm..."
-  if pnpm add -g karnel-termux@latest 2>&1; then
-    log_success "Karnel upgraded via pnpm"
-  else
-    log_error "pnpm upgrade failed"
+_upgrade_fix_symlink() {
+  if [[ ! -L "$PREFIX/bin/karnel" ]] || [[ "$(readlink "$PREFIX/bin/karnel")" != "$KARNEL_PATH/bin/karnel" ]]; then
+    ln -sf "$KARNEL_PATH/bin/karnel" "$PREFIX/bin/karnel" 2>/dev/null
+    log_success "Symlink updated"
   fi
 }

package/karnel/utils/env.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-KARNEL_VERSION="4.11.2"
+KARNEL_VERSION="4.11.3"
 
 # -------------------------
 # Directorios del usuario

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karnel-termux",
-  "version": "4.11.2",
+  "version": "4.11.3",
   "description": "Modular Dev Environment for Termux — install languages, databases, AI agents, editors, and more with one command",
   "bin": {
     "karnel": "karnel/bin/karnel"