karnel-termux 4.17.0 → 4.17.1

package/install.sh

@@ -79,7 +79,9 @@ _INSTALL_KARNEL_SYMLINK_CHANGED=false
 _INSTALL_PREVIOUS_KARNEL_SYMLINK=""
 
 _cleanup_failed() {
-	echo -e "\n  ${P_FAIL}✖${P_NC}  Installation failed at step ${CURRENT_STEP}. Cleaning up..."
+  set +e
+  trap - ERR
+  echo -e "\n  ${P_FAIL}✖${P_NC}  Installation failed at step ${CURRENT_STEP}. Cleaning up..."
 	if $_INSTALL_KARNEL_SYMLINK_CHANGED; then
 		if [[ -n "$_INSTALL_PREVIOUS_KARNEL_SYMLINK" ]]; then
 			local rollback_link_dir
@@ -287,7 +289,23 @@ clone_repo() {
 			log_fail "Failed to clone repository"
 			return 1
 		fi
-		if [[ -n "$RELEASE_REF" ]]; then
+		if [[ -n "$RELEASE_COMMIT" ]]; then
+			if ! git -C "$candidate_repo" fetch --depth=1 origin "$RELEASE_COMMIT" &>/dev/null; then
+				log_fail "Failed to fetch release commit $RELEASE_COMMIT"
+				return 1
+			fi
+			if ! git -C "$candidate_repo" checkout --quiet --detach "$RELEASE_COMMIT" &>/dev/null; then
+				log_fail "Failed to checkout release commit $RELEASE_COMMIT"
+				return 1
+			fi
+			local candidate_commit
+			candidate_commit=$(git -C "$candidate_repo" rev-parse HEAD 2>/dev/null) || return 1
+			if [[ "$candidate_commit" != "$RELEASE_COMMIT" ]]; then
+				log_fail "Release commit mismatch"
+				log_info "Expected $RELEASE_COMMIT, got $candidate_commit"
+				return 1
+			fi
+		elif [[ -n "$RELEASE_REF" ]]; then
 			local candidate_commit
 			candidate_commit=$(git -C "$candidate_repo" rev-parse HEAD 2>/dev/null) || return 1
 			if [[ "$candidate_commit" != "$RELEASE_COMMIT" ]]; then

package/karnel/RELEASE_COMMIT

@@ -1 +1 @@
-57a1aa3e5401b6ba9b37965d8680bcb543b0fc00
+c9797260b1affd17127bf2b1e5c22c1cf184adb1

package/karnel/bin/karnel

@@ -30,7 +30,8 @@ import "@/utils/env"
 
 # ===== SEMVER COMPARISON =====
 _semver_gt() {
-  [[ "$(printf '%s\n%s' "$1" "$2" | sort -V | tail -1)" == "$1" ]] && [[ "$1" != "$2" ]]
+  local a="${1#v}" b="${2#v}"
+  [[ "$(printf '%s\n%s' "$a" "$b" | sort -V | tail -1)" == "$a" ]] && [[ "$a" != "$b" ]]
 }
 
 _valid_semver() {

package/karnel/cli/commands/doctor/fixes.sh

@@ -292,7 +292,7 @@ _fix_locale() {
   if [[ ! -f "$config" ]] && [[ -f "$HOME/.bashrc" ]]; then
     config="$HOME/.bashrc"
   fi
-  echo 'export LANG=en_US.UTF-8' >> "$config" 2>/dev/null
+  grep -qxF 'export LANG=en_US.UTF-8' "$config" 2>/dev/null || echo 'export LANG=en_US.UTF-8' >> "$config" 2>/dev/null
 }
 
 
@@ -425,6 +425,6 @@ _fix_keyring() {
 }
 
 _fix_apt_cache() {
-  rm -rf "$PREFIX/var/apt/lists"/* 2>/dev/null
+  rm -rf "${PREFIX:?}/var/apt/lists"/* 2>/dev/null
   pkg update -y &>/dev/null
 }

package/karnel/cli/commands/init.sh

@@ -1078,33 +1078,33 @@ configure_rust() {
 
 	# Append dependencies to Cargo.toml
 	if [[ -f "Cargo.toml" ]]; then
-		# Append after [dependencies] or add it
-		if grep -q '^\[dependencies\]' Cargo.toml; then
-			cat >>Cargo.toml <<EOF
-EOF
-		else
-			echo -e "\n[dependencies]" >> Cargo.toml
+		if ! grep -q '^\[dependencies\]' Cargo.toml; then
+			printf '\n[dependencies]\n' >> Cargo.toml
 		fi
-		cat >>Cargo.toml <<EOF
-tokio = { version = "1.0", features = ["full"] }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-dotenvy = "0.15"
-EOF
+		local dep name spec
+		local -a deps=(
+			'tokio = { version = "1.0", features = ["full"] }'
+			'serde = { version = "1.0", features = ["derive"] }'
+			'serde_json = "1.0"'
+			'dotenvy = "0.15"'
+		)
 		if [[ "$framework_choice" == "Axum" ]]; then
-			cat >>Cargo.toml <<EOF
-axum = "0.7"
-EOF
+			deps+=('axum = "0.7"')
 		else
-			cat >>Cargo.toml <<EOF
-actix-web = "4.0"
-EOF
+			deps+=('actix-web = "4.0"')
 		fi
 		if [[ "$db_choice" == "SQLx (PostgreSQL)" ]]; then
-			cat >>Cargo.toml <<EOF
-sqlx = { version = "0.7", features = ["runtime-tokio", "postgres", "macros"] }
-EOF
+			deps+=('sqlx = { version = "0.7", features = ["runtime-tokio", "postgres", "macros"] }')
 		fi
+		for dep in "${deps[@]}"; do
+			name="${dep%% =*}"
+			name="${name%%[[:space:]]*}"
+			if grep -q "^${name} =" Cargo.toml; then
+				log_info "Dependency already present: ${name}"
+			else
+				sed -i "/^\[dependencies\]/a ${dep}" Cargo.toml
+			fi
+		done
 		log_success "Configured Cargo.toml"
 	fi
 

package/karnel/tools/deploy/netlify/install.sh

@@ -15,6 +15,13 @@ install_netlify() {
   if command -v netlify &>/dev/null && netlify --version &>/dev/null; then
     log_info "Netlify CLI is already installed"
     return 2
+  fi
+  if ! command -v node &>/dev/null || ! command -v npm &>/dev/null; then
+    log_info "Installing Node.js..."
+    if ! pkg install -y nodejs-lts &>>"$LOG_FILE"; then
+      log_error "Failed to install Node.js"
+      return 1
+    fi
   fi
 	if ! _netlify_node_supported; then
 		log_error "Netlify CLI requires Node.js 22.13.0 or newer. Update Node.js and retry."

package/karnel/tools/deploy/railway/install.sh

@@ -185,6 +185,15 @@ uninstall_railway() {
 }
 
 update_railway() {
+  if _railway_proot_wrapper_owned; then
+    log_info "Railway was installed via Ubuntu PRoot; updating inside the container..."
+    if proot-distro login ubuntu -- npm update -g @railway/cli &>>"$LOG_FILE"; then
+      log_success "Railway CLI updated through Ubuntu Proot"
+      return 0
+    fi
+    log_warn "Railway CLI update failed inside Ubuntu Proot"
+    return 1
+  fi
   _check_update_needed "Railway CLI" "$(_get_installed_npm_version @railway/cli)" "$(_get_remote_npm_version @railway/cli)" _do_update_railway
 }
 

package/karnel/tools/deploy/vercel/install.sh

@@ -10,6 +10,13 @@ install_vercel() {
     log_info "Vercel CLI is already installed"
     return 2
   fi
+  if ! command -v node &>/dev/null || ! command -v npm &>/dev/null; then
+    log_info "Installing Node.js..."
+    if ! pkg install -y nodejs-lts &>>"$LOG_FILE"; then
+      log_error "Failed to install Node.js"
+      return 1
+    fi
+  fi
   log_info "Installing Vercel CLI..."
   npm install -g vercel &>/dev/null || {
     log_error "Failed to install Vercel CLI"

package/karnel/tools/lang/bun/install.sh

@@ -296,6 +296,7 @@ _install_bun_proot_impl() {
   fi
   sed "s|__UBUNTU_ROOTFS__|$ubuntu_root|g" "$wrapper_src" >"$PREFIX/bin/bun"
   chmod +x "$PREFIX/bin/bun"
+  mkdir -p "$BUN_DATA_DIR" && : >"$BUN_DATA_DIR/.karnel-proot"
   return 0
 }
 
@@ -339,7 +340,12 @@ _uninstall_bun_impl() {
     _uninstall_bun_native
     return $?
   fi
-  _uninstall_bun_proot
+  if [ -f "$BUN_DATA_DIR/.karnel-proot" ]; then
+    _uninstall_bun_proot
+    return $?
+  fi
+  log_error "Refusing to remove unowned bun command: $PREFIX/bin/bun"
+  return 1
 }
 
 uninstall_bun() {

package/karnel/tools/npm/turbopack/install.sh

@@ -178,8 +178,8 @@ install_turbopack() {
 
 uninstall_turbopack() {
 	if ! _has_glibc_node; then
-		log_warn "Turbopack is not installed"
-		return 1
+		log_info "Turbopack is not installed"
+		return 2
 	fi
 
 	loading "Removing CLI wrappers" _uninstall_wrappers

package/karnel/tools/shell/zsh-defer/install.sh

@@ -60,7 +60,7 @@ install_zsh_defer() {
 _uninstall_zsh_defer_impl() {
   if [[ ! -d "$ZSH_PLUGINS_DIR/zsh-defer" ]]; then
     log_info "zsh-defer is not installed"
-    return 2
+    return 0
   fi
 
   local remove_rc=0

package/karnel/utils/install.sh

@@ -269,8 +269,14 @@ managed_file_matches() {
 
 github_download_and_extract() {
   local repo="$1" version="$2" asset="$3" outdir="$4"
-  local tarball
+  local tarball expected
   tarball=$(github_download_release "$repo" "$version" "$asset" "$outdir") || return 1
+  expected=$(github_release_asset_sha256 "$repo" "$version" "$asset") || expected=""
+  if [[ "$expected" =~ ^[0-9a-f]{64}$ ]]; then
+    verify_sha256 "$tarball" "$expected" || return 1
+  else
+    log_warn "No published SHA-256 digest for $repo/$asset; skipping integrity verification"
+  fi
   extract_tarball "$tarball" "$outdir" || return 1
   return 0
 }

package/karnel/utils/tools.sh

@@ -106,6 +106,10 @@ _batch_tool_action() {
   local failed_count=0
   local skipped_count=0
 
+  # An explicit uninstall should actually remove owned data, even when no TTY
+  # is attached (piped/non-interactive). Ownership is still guarded upstream.
+  [[ "$action" == "uninstall" ]] && export KARNEL_REMOVE_DEFAULT=y
+
   import "@/tools/$module/all"
 
   for tool in "${tools[@]}"; do

package/karnel/utils/uninstall.sh

@@ -3,6 +3,7 @@
 confirm_remove_paths() {
   local label="$1"
   shift
+  local default="${KARNEL_REMOVE_DEFAULT:-n}"
   local answer path
   local -a existing=()
 
@@ -11,7 +12,7 @@ confirm_remove_paths() {
   done
   (( ${#existing[@]} > 0 )) || return 0
 
-  read_confirm_default "Remove $label configuration and data?" "n" answer || return 2
+  read_confirm_default "Remove $label configuration and data?" "$default" answer || return 2
   [[ "$answer" == "y" ]] || return 2
 
   rm -rf -- "${existing[@]}"

package/package.json

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