karnel-termux 4.17.23 → 4.17.27

package/karnel/RELEASE_COMMIT

@@ -1 +1 @@
-9e1cc56cd0e413f5135180c07ae5c9cea021e4ba
+da9b390f62c1b73f31fa5a00a458162589b09c38

package/karnel/tools/utils/qrcode/install.sh

@@ -7,12 +7,25 @@ import "@/utils/downloaded-python"
 LOG_FILE="$KARNEL_CACHE/install_dev.log"
 DOWNLOAD_URL="https://raw.githubusercontent.com/dedsec1121fk/DedSec/87d69293f4b89b8ab114fa644074629e86313182/Scripts/Network%20Tools/QR%20Code%20Generator.py"
 
+_qrcode_dependencies() {
+  if ! command -v python3 &>/dev/null && ! pkg install python -y &>>"$LOG_FILE"; then
+    return 1
+  fi
+  if ! python3 -c 'import PIL' &>/dev/null && ! pkg install python-pillow -y &>>"$LOG_FILE"; then
+    return 1
+  fi
+  if ! python3 -c 'import qrcode' &>/dev/null && ! python3 -m pip install --no-deps qrcode &>>"$LOG_FILE"; then
+    return 1
+  fi
+  python3 -c 'import qrcode, PIL' &>/dev/null
+}
+
 install_qrcode() {
   local TOOL_DIR="$KARNEL_DATA/utils/qrcode"
   local BIN_NAME="qrcode"
   log_info "Installing QR Code Generator..."
   mkdir -p "$(dirname "$LOG_FILE")" "$TOOL_DIR"
-  if ! command -v python3 &>/dev/null; then pkg install python -y &>>"$LOG_FILE" || return 1; fi
+  _qrcode_dependencies || { log_error "Failed to install QR Code Generator dependencies"; return 1; }
   _downloaded_python_install "$BIN_NAME" "$TOOL_DIR" "$DOWNLOAD_URL" || return $?
   log_success "QR Code Generator installed"
   return 0
@@ -31,6 +44,7 @@ update_qrcode() {
   local TOOL_DIR="$KARNEL_DATA/utils/qrcode"
   local BIN_NAME="qrcode"
   log_info "Updating QR Code Generator..."
+  _qrcode_dependencies || { log_error "Failed to install QR Code Generator dependencies"; return 1; }
   _downloaded_python_update "$BIN_NAME" "$TOOL_DIR" "$DOWNLOAD_URL" || return 1
   log_success "QR Code Generator updated"
   return 0

package/karnel/tools/utils/qrcode/qrcode.py

@@ -1,36 +1,14 @@
 #!/data/data/com.termux/files/usr/bin/python3
 import os
 import re
-import subprocess
 import sys
 
-# --- Installation Function (Same as before) ---
-def install_and_import(package):
-    """
-    Checks if a package is installed and installs it if missing.
-    The 'qrcode[pil]' installs both qrcode and Pillow (PIL) for image generation.
-    """
-    try:
-        __import__(package)
-        print(f"✅ Required package '{package}' is already installed.")
-    except ImportError:
-        print(f"📦 Package '{package}' not found. Installing now...")
-        try:
-            if package == 'qrcode':
-                # Install qrcode with pil dependency for image saving
-                subprocess.check_call([sys.executable, "-m", "pip", "install", "qrcode[pil]"])
-            else:
-                subprocess.check_call([sys.executable, "-m", "pip", "install", package])
-            
-            __import__(package)
-            print(f"✅ Successfully installed '{package}'.")
-        except subprocess.CalledProcessError as e:
-            print(f"❌ Failed to install '{package}'. Error: {e}")
-            print("Please ensure 'pip' is installed and working in Termux.")
-            sys.exit(1)
+# The launcher is named qrcode.py, so remove its directory before importing
+# the third-party qrcode package to avoid importing this file recursively.
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+sys.path = [path for path in sys.path if path not in ("", SCRIPT_DIR)]
 
-install_and_import('qrcode')
-import qrcode 
+import qrcode
 
 # ----------------------------------------------------------------------
 # --- Main Generator Function (Updated Path) ---
@@ -87,4 +65,4 @@ def generate_qr_for_link():
         print(f"\n❌ Error saving file: {e}")
 
 if __name__ == "__main__":
-    generate_qr_for_link()
+    generate_qr_for_link()

package/package.json

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