akashcli 4.6.4__tar.gz → 4.6.6__tar.gz

{akashcli-4.6.4 → akashcli-4.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.6.4
+Version: 4.6.6
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License-Expression: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.6.4 → akashcli-4.6.6}/akashcli/__init__.py

@@ -2,6 +2,6 @@ try:
     from importlib.metadata import version
     __version__ = version("akashcli")
 except Exception:
-    __version__ = "4.6.4"
+    __version__ = "4.6.6"
 
 AKASH_VERSION = __version__

{akashcli-4.6.4 → akashcli-4.6.6}/akashcli/cli.py

@@ -155,10 +155,19 @@ app = typer.Typer(
     no_args_is_help=False,
 )
 
+def raise_exit():
+    raise typer.Exit(0)
+
+def _print_version(value: bool):
+    if value:
+        from . import __version__
+        print(f"akashcli v{__version__}")
+        raise typer.Exit(0)
+
 @app.callback(invoke_without_command=True)
 def _main(ctx: typer.Context,
           version: bool = typer.Option(False, "--version", "-v", is_eager=True, expose_value=False,
-                                       callback=lambda v: (print("akashcli v1.5.0"), raise_exit()) if v else None,
+                                       callback=_print_version,
                                        help="Show version and exit."),
           help: bool = typer.Option(False, "--help", "-h", is_eager=True, expose_value=False,
                                     callback=lambda v: (_print_help(), raise_exit()) if v else None,
@@ -168,8 +177,7 @@ def _main(ctx: typer.Context,
         _print_help()
         raise typer.Exit(0)
 
-def raise_exit():
-    raise typer.Exit(0)
+
 
 def _print_help():
     C, G, Y, DM, RS = _C, _G, _Y, _DM, _RS

{akashcli-4.6.4 → akashcli-4.6.6}/akashcli/relay.py

@@ -25,7 +25,7 @@ Wire protocol (all JSON frames over the relay WebSocket):
 
 from __future__ import annotations
 
-AKASH_VERSION = "4.6.4"
+AKASH_VERSION = "4.6.6"
 
 import base64
 import json
@@ -290,31 +290,24 @@ def _handle_pty(ws, frame: dict) -> None:
     import subprocess as _sp
     import tempfile as _tmp
 
-    shell = command or os.environ.get("SHELL", "/bin/bash")
-
-    # On Android non-root, TIOCSCTTY is blocked by SELinux so bash prints:
-    #   "cannot set terminal process group … no job control"
-    # Fix: launch bash with --rcfile pointing to a temp file that sources
-    # ~/.bashrc then runs `set +m` (disable job-control monitoring).
-    # This silences the warning while keeping the shell fully interactive.
-    _env = {**os.environ,
-            "TERM": "xterm-256color",
-            "COLUMNS": str(cols), "LINES": str(rows)}
+    shell_bin = os.environ.get("SHELL", "/bin/bash")
+    _env = {**os.environ, "TERM": "xterm-256color", "COLUMNS": str(cols), "LINES": str(rows)}
     _bash_env_file = None
-    _shell_args = [shell]
-    if "bash" in shell.lower():
-        try:
-            _fd, _bash_env_file = _tmp.mkstemp(prefix=".akash_rc_", suffix=".sh")
-            # Source ~/.bashrc if it exists, then disable job-control monitoring
-            _rc = (
-                b'[ -f ~/.bashrc ] && . ~/.bashrc\n'
-                b'set +m\n'
-            )
-            os.write(_fd, _rc)
-            os.close(_fd)
-            _shell_args = [shell, "--rcfile", _bash_env_file]
-        except Exception:
-            _bash_env_file = None
+
+    if command:
+        # Evaluate commands with flags/arguments through the shell
+        _shell_args = [shell_bin, "-c", command]
+    else:
+        _shell_args = [shell_bin]
+        if "bash" in shell_bin.lower():
+            try:
+                _fd, _bash_env_file = _tmp.mkstemp(prefix=".akash_rc_", suffix=".sh")
+                _rc = b'[ -f ~/.bashrc ] && . ~/.bashrc\nset +m\n'
+                os.write(_fd, _rc)
+                os.close(_fd)
+                _shell_args = [shell_bin, "--rcfile", _bash_env_file]
+            except Exception:
+                _bash_env_file = None
 
     try:
         proc = _sp.Popen(
@@ -919,9 +912,14 @@ _PTY_APPS = frozenset({
 
 def _is_pty_cmd(cmd: str) -> bool:
     """Return True if cmd should run in PTY mode (TUI / interactive app)."""
-    first = cmd.strip().lstrip("\\").split()[0] if cmd.strip() else ""
-    # strip path — /usr/bin/vim → vim
-    first = first.split("/")[-1]
+    parts = cmd.strip().lstrip("\\").split()
+    if not parts:
+        return False
+    first = parts[0].split("/")[-1]
+    # Commands with -c, -e, or file arguments are batch scripts, NOT interactive TUI sessions
+    if first in ("python", "python3", "ipython", "node", "ruby", "perl"):
+        if len(parts) > 1 and (parts[1] in ("-c", "-e") or not parts[1].startswith("-")):
+            return False
     return first in _PTY_APPS
 
 

{akashcli-4.6.4 → akashcli-4.6.6}/akashcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: akashcli
-Version: 4.6.4
+Version: 4.6.6
 Summary: Akash CLI — secure remote shell relay, file vault, and device management
 License-Expression: MIT
 Keywords: akash,cli,relay,remote-shell,vault

{akashcli-4.6.4 → akashcli-4.6.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "akashcli"
-version = "4.6.4"
+version = "4.6.6"
 description = "Akash CLI — secure remote shell relay, file vault, and device management"
 readme = "README.md"
 requires-python = ">=3.9"