machineconfig 7.57__tar.gz → 7.59__tar.gz

{machineconfig-7.57/src/machineconfig.egg-info → machineconfig-7.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 7.57
+Version: 7.59
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-7.57 → machineconfig-7.59}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "7.57"
+version = "7.59"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/custom/boxes.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 from rich.console import Console
 from rich.panel import Panel
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
@@ -40,7 +40,7 @@ def main(installer_data: InstallerData, version: Optional[str] = None) -> None:
     )
 
     installer = Installer(installer_data=installer_data_modified)
-    downloaded, _version_to_be_installed = installer.download(version=version)
+    downloaded, _version_to_be_installed = installer.binary_download(version=version)
     decomp_path = downloaded.decompress()
     from pathlib import Path
     for item in decomp_path.rglob("*"):

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/custom/hx.py

@@ -3,11 +3,11 @@ Installers do not add runtime files to the machine, hence this script.
 """
 
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 from typing import Optional
 import platform
 
-from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import LINUX_INSTALL_PATH
 from machineconfig.utils.installer_utils.installer_class import Installer
 from rich.console import Console
 from rich.panel import Panel
@@ -45,7 +45,7 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
     inst = Installer(installer_data=config_dict_copy)
 
     print("\n📥 [Step 1/5] Downloading Helix editor...")
-    downloaded, _version_to_be_installed = inst.download(version=version)
+    downloaded, _version_to_be_installed = inst.binary_download(version=version)
     print("   ✨ Download complete.")
 
     print("\n🔍 [Step 2/5] Locating executable and components...")

machineconfig-7.59/src/machineconfig/jobs/installer/custom_dev/cloudflare_warp_cli.py

@@ -0,0 +1,23 @@
+
+from typing import Optional
+import platform
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data, version
+    system = platform.system()
+    if system == "Windows":
+        raise NotImplementedError("Installer is not yet implemented for Windows.")
+    elif system == "Linux":
+        from pathlib import Path
+        import machineconfig.jobs.installer as module
+        program = Path(module.__file__).parent.joinpath("linux_scripts/cloudflare_warp_cli.sh").read_text(encoding="utf-8")
+    elif system == "Darwin":
+        program = "brew install --cask cloudflare-warp"
+    else:
+        raise NotImplementedError(f"Unsupported platform: {system}")
+    import subprocess
+    subprocess.run(program, shell=True, check=True)
+    return f"Cloudflare WARP CLI installed successfully on {system}."
+

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/custom_dev/dubdb_adbc.py

@@ -25,6 +25,6 @@ installer_data: InstallerData = {
 
 def main(installer_data: InstallerData, version: Optional[str]) -> None:
     _ = version
-    from machineconfig.utils.installer import Installer
+    from machineconfig.utils.installer_utils.installer_runner import Installer
     installer = Installer(installer_data)
     installer.install(version=None)

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/custom_dev/nerfont_windows_helper.py

@@ -116,7 +116,7 @@ def install_nerd_fonts() -> None:
     console.print(f"🔍 Missing fonts detected: {', '.join(missing)}. Proceeding with installation...")
     console.print("🔍 Downloading Nerd Fonts package...")
     
-    folder, _version_to_be_installed = Installer(installer_data=nerd_fonts).download(version=None)
+    folder, _version_to_be_installed = Installer(installer_data=nerd_fonts).binary_download(version=None)
 
     console.print("🧹 Cleaning up unnecessary files...")
     [p.delete(sure=True) for p in folder.search("*Windows*")]

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/custom_dev/sysabc.py

@@ -64,37 +64,18 @@ export NVM_DIR="$HOME/.nvm"
 echo "📥 Installing latest Node.js..."
 nvm install node || true
 
-# --GROUP:TerminalEyeCandy:fortune,toilet,sl,aafire,cmatrix,hollywood,chafa
-# echo "📥 Installing fortune - random wisdom generator..."
-# echo "📥 Installing toilet - large ASCII text generator..."
-# echo "📥 Installing sl - steam locomotive animation..."
-# echo "📥 Installing aafire - ASCII art fire animation..."
-# echo "📥 Installing cmatrix - Matrix-style terminal animation..."
-# echo "📥 Installing hollywood - Hollywood hacker terminal effect..."
-# echo "📥 Installing chafa - terminal image viewer..."
-# sudo nala install cowsay -y || true
-# sudo nala install lolcat -y || true
-# sudo nala install boxes -y || true
-# sudo nala install figlet -y || true
-# sudo nala install fortune -y || true
-# sudo nala install toilet -y || true
-# sudo nala install chafa -y
-# sudo nala install sl -y || true
-# sudo nala install libaa-bin -y
 # echo 'keyboard-configuration keyboard-configuration/layout select US English' | sudo debconf-set-selections
 # echo 'keyboard-configuration keyboard-configuration/layoutcode string us' | sudo debconf-set-selections
 # sudo DEBIAN_FRONTEND=noninteractive nala install -y cmatrix
 # sudo nala install hollywood -y || true
-
-# --GROUP:net: sshfs,samba,fuse3,nfs-common
 sudo nala install samba
 sudo nala install fuse3 -y || true
 sudo nala install nfs-common -y || true
-# --GROUP:dev: graphviz,make,rust,libssl-dev,sqlite3,postgresql-client,redis-tools
 # sudo nala install ffmpeg -y || true  # Required by some dev tools
 # sudo nala install make -y || true  # Required by LunarVim and SpaceVim
 # (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true
 # sudo nala install libssl-dev -y
+# sudo nala install libaa-bin -y
 """
 
 

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/custom_dev/wezterm.py

@@ -9,10 +9,6 @@ from rich.panel import Panel
 
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-
-# config_dict: InstallerData = {"appName": "Wezterm", "repoURL": "CMD", "doc": "Modern, GPU-accelerated terminal emulator"}
-
-
 console = Console()
 
 

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/installer_data.json

@@ -528,6 +528,40 @@
         }
       }
     },
+    {
+      "appName": "cloudflare-warp",
+      "repoURL": "CMD",
+      "doc": "🌐 Cloudflare WARP VPN client",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": null,
+          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
+          "macos": null
+        },
+        "arm64": {
+          "linux": null,
+          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
+          "macos": null
+        }
+      }
+    },
+    {
+      "appName": "cloudflare-warp-cli",
+      "repoURL": "CMD",
+      "doc": "🌐 Cloudflare WARP VPN client in the terminal",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "cloudflare_warp_cli.py",
+          "windows": "cloudflare_warp_cli.py",
+          "macos": "cloudflare_warp_cli.py"
+        },
+        "arm64": {
+          "linux": "cloudflare_warp_cli.py",
+          "windows": "cloudflare_warp_cli.py",
+          "macos": "cloudflare_warp_cli.py"
+      }
+    }
+    },
     {
       "appName": "cpufetch",
       "repoURL": "https://github.com/Dr-Noob/cpufetch",
@@ -2488,16 +2522,33 @@
       "appName": "warp",
       "repoURL": "CMD",
       "doc": "Modern terminal with AI-powered features",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "https://app.warp.dev/get_warp?package=deb",
+          "windows": "winget install Warp.Warp",
+          "macos": "brew install --cask warp"
+        },
+        "arm64": {
+          "linux": "https://app.warp.dev/get_warp?package=deb_arm64",
+          "windows": "winget install Warp.Warp",
+          "macos": "brew install --cask warp"
+        }
+      }
+    },
+    {
+      "appName": "warp-terminal-cli",
+      "repoURL": "CMD",
+      "doc": "Modern terminal cli with AI-powered features",
       "fileNamePattern": {
         "amd64": {
           "linux": "https://app.warp.dev/download/cli?os=linux&package=deb&arch=x86_64",
           "windows": null,
-          "macos": null
+          "macos": " brew tap warpdotdev/warp; brew update; brew install --cask warp-cli"
         },
         "arm64": {
           "linux": "https://app.warp.dev/download/cli?os=linux&package=deb&arch=aarch64",
           "windows": null,
-          "macos": null
+          "macos": " brew tap warpdotdev/warp; brew update; brew install --cask warp-cli"
         }
       }
     },
@@ -2638,7 +2689,7 @@
       }
     },
     {
-      "appName": "Gorilla",
+      "appName": "gorilla",
       "repoURL": "https://github.com/ShishirPatil/gorilla",
       "doc": "natural language to API",
       "fileNamePattern": {
@@ -2689,7 +2740,7 @@
       }
     },
     {
-      "appName": "Redis",
+      "appName": "redis",
       "repoURL": "CMD",
       "doc": "submillisecond fast key-value db",
       "fileNamePattern": {
@@ -2994,23 +3045,6 @@
         }
       }
     },
-    {
-      "appName": "cloudflare-warp",
-      "repoURL": "CMD",
-      "doc": "🌐 Cloudflare WARP VPN client",
-      "fileNamePattern": {
-        "amd64": {
-          "linux": null,
-          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
-          "macos": null
-        },
-        "arm64": {
-          "linux": null,
-          "windows": "winget install --no-upgrade --name \"Cloudflare WARP\" --Id \"Cloudflare.Warp\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
-          "macos": null
-        }
-      }
-    },
     {
       "appName": "mouse-without-borders",
       "repoURL": "CMD",
@@ -3323,12 +3357,12 @@
       "doc": "🖼️ Terminal graphics and image viewer",
       "fileNamePattern": {
         "amd64": {
-          "linux": null,
+          "linux": "sudo nala install chafa -y",
           "windows": "winget install --no-upgrade --name \"Chafa\" --Id \"hpjansson.Chafa\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
           "macos": "brew install chafa"
         },
         "arm64": {
-          "linux": null,
+          "linux": "sudo nala install chafa -y",
           "windows": "winget install --no-upgrade --name \"Chafa\" --Id \"hpjansson.Chafa\" --source winget --scope user --accept-package-agreements --accept-source-agreements",
           "macos": "brew install chafa"
         }

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/jobs/installer/package_groups.py

@@ -24,6 +24,7 @@ AGENTS = [
     "kilocode",
     "cline",
     "auggie",
+    # "gorilla",
 ]
 
 
@@ -62,11 +63,13 @@ PACKAGES_CODE_EDITORS = [
 PACKAGES_DATABASE = [
     "SqliteBrowser",
     "sqlite3",
+    "redis",
     "redis-cli",
     "postgresql-client",
     "duckdb",
     "DBeaver",
     "rainfrog",
+
 ]
 
 
@@ -146,20 +149,23 @@ PACKAGES_PRODUCTIVITY = [
     "hx",
 ]
 
-# Miscellaneous Tools - Other tools
-PACKAGES_MISC_DEV = [
+
+# sudo nala install cowsay -y || true
+# sudo nala install lolcat -y || true
+# sudo nala install boxes -y || true
+# sudo nala install figlet -y || true
+# sudo nala install fortune -y || true
+# sudo nala install toilet -y || true
+TERMINAL_EYE_CANDY = [
     "lolcatjs",
     "figlet-cli",
     "boxes",
-    "Gorilla",
-    "Redis",
-    "transmission",
-    "bytehound",
-    "atuin",
-    "xcrawl3r",
-    "obsidian",
-    "istio",
-    "cointop",
+    # "transmission",
+    # "bytehound",
+    # "xcrawl3r",
+    # "obsidian",
+    # "istio",
+    # "cointop",
 ]
 
 
@@ -216,6 +222,7 @@ PACKAGES_TERMINAL_SHELL = [
     "zellij",
     "mprocs",
     "mcfly",
+    "atuin",
     "starship",
     "gotty",
     "ttyd",
@@ -229,9 +236,9 @@ PACKAGE_GROUP2NAMES: dict[str, list[str]] = {
     "sysabc": ["sysabc"],
     "termabc": [*PACKAGES_CODE_ANALYSIS, *PACKAGES_SYSTEM_MONITORS, *PACKAGES_TERMINAL_SHELL, *PACKAGES_FILE,],
     "gui": GUI,
-    "dev": [*PACKAGES_TERMINAL_EMULATORS, *PACKAGES_BROWSERS, *PACKAGES_CODE_EDITORS, *PACKAGES_DATABASE, *PACKAGES_MEDIA, *PACKAGES_FILE_SHARING, *PACKAGES_DEV_UTILS, *PACKAGES_CODE_ANALYSIS, *PACKAGES_PRODUCTIVITY, *PACKAGES_MISC_DEV,],
+    "dev": [*PACKAGES_TERMINAL_EMULATORS, *PACKAGES_BROWSERS, *PACKAGES_CODE_EDITORS, *PACKAGES_DATABASE, *PACKAGES_MEDIA, *PACKAGES_FILE_SHARING, *PACKAGES_DEV_UTILS, *PACKAGES_CODE_ANALYSIS, *PACKAGES_PRODUCTIVITY, *TERMINAL_EYE_CANDY,],
     "dev-utils": PACKAGES_DEV_UTILS,
-    "dev-msc": PACKAGES_MISC_DEV,
+    "term-eye-candy": TERMINAL_EYE_CANDY,
     "agents": AGENTS,
     "terminal-emulator": PACKAGES_TERMINAL_EMULATORS,
     "shell": PACKAGES_TERMINAL_SHELL,

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/linux/wrap_mcfg

@@ -13,7 +13,7 @@ wrap_in_shell_script() {
 
   local command="$1"
   shift  
-  local RANDOM_NAME=$(date +%s%N | sha256sum | head -c 16)
+  local RANDOM_NAME=$(uuidgen | tr -d '-' | head -c 16)
   local OP_DIR="$HOME/tmp_results/tmp_scripts/machineconfig"
   local OP_PROGRAM_PATH="$OP_DIR/${RANDOM_NAME}.sh"
   export OP_PROGRAM_PATH

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/croshell.py

@@ -107,7 +107,7 @@ def croshell(
             fire_line = f"uv run --python 3.14 --with visidata,pyarrow vd {str(file_obj)}"
     elif marimo:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--with marimo --project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: requirements = """--python 3.14 --with "marimo,cowsay,machineconfig[plot]>=7.57" """
+        else: requirements = """--python 3.14 --with "marimo,cowsay,machineconfig[plot]>=7.59" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --python 3.14 --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -115,14 +115,14 @@ uv run {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
 """
     elif jupyter:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with jupyterlab """
-        else: requirements = """--with "cowsay,machineconfig[plot]>=7.57" """
+        else: requirements = """--with "cowsay,machineconfig[plot]>=7.59" """
         fire_line = f"uv run {requirements} jupyter-lab {str(nb_target)}"
     elif vscode:
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv init --python 3.14
 uv venv
-uv add "cowsay,machineconfig[plot]>=7.57"
+uv add "cowsay,machineconfig[plot]>=7.59"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -130,7 +130,7 @@ code --new-window {str(pyfile)}
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
         if Path.home().joinpath("code/machineconfig").exists(): ve_line = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: ve_line = """--python 3.14 --with "cowsay,machineconfig[plot]>=7.57" """
+        else: ve_line = """--python 3.14 --with "cowsay,machineconfig[plot]>=7.59" """
         # ve_path_maybe, ipython_profile_maybe = get_ve_path_and_ipython_profile(Path.cwd())
         # --python 3.14
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/devops.py

@@ -15,7 +15,7 @@ def install(which: Annotated[Optional[str], typer.Argument(..., help="Comma-sepa
         interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Interactive selection of programs to install.")] = False,
     ) -> None:
         """📦 Install packages"""
-        import machineconfig.utils.installer_utils.installer as installer_entry_point
+        import machineconfig.utils.installer_utils.installer_cli as installer_entry_point
         installer_entry_point.main(which=which, group=group, interactive=interactive)
 
 

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=7.57",
+#     "machineconfig>=7.59",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/helpers_croshell/crosh.py

@@ -20,9 +20,9 @@ def get_read_data_pycode(path: str):
     from rich.panel import Panel
     from rich.text import Text
     from rich.console import Console
-    from machineconfig.utils.path_extended import PathExtended
+    from pathlib import Path
     console = Console()
-    p = PathExtended(path).absolute()
+    p = Path(path).absolute()
     try:
         from machineconfig.utils.files.read import Read
         from machineconfig.utils.accessories import pprint

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py

@@ -45,18 +45,17 @@ def main(
             dest_path = Path(destination).expanduser().absolute()
             dest_path.mkdir(parents=True, exist_ok=True)
             new_path = dest_path.joinpath(orig_path.name)
-    from machineconfig.utils.path_extended import PathExtended
     match method:
         case "copy" | "c":
             try:
-                copy_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=ON_CONFLICT_MAPPER[on_conflict])
+                copy_map(config_file_default_path=orig_path, self_managed_config_file_path=new_path, on_conflict=ON_CONFLICT_MAPPER[on_conflict])  # type: ignore[arg-type]
             except Exception as e:
                 typer.echo(f"[red]Error:[/] {e}")
                 typer.Exit(code=1)
                 return
         case "symlink" | "s":
             try:
-                symlink_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=ON_CONFLICT_MAPPER[on_conflict])
+                symlink_map(config_file_default_path=orig_path, self_managed_config_file_path=new_path, on_conflict=ON_CONFLICT_MAPPER[on_conflict])  # type: ignore[arg-type]
             except Exception as e:
                 typer.echo(f"[red]Error:[/] {e}")
                 typer.Exit(code=1)
@@ -66,10 +65,10 @@ def main(
 
     # mapper_snippet = "\n".join(
     #     [
-    #         f"[bold]📝 Edit configuration file:[/] [cyan]nano {PathExtended(CONFIG_ROOT)}/symlinks/mapper.toml[/cyan]",
+    #         f"[bold]📝 Edit configuration file:[/] [cyan]nano {Path(CONFIG_ROOT)}/symlinks/mapper.toml[/cyan]",
     #         "",
     #         f"[{new_path.parent.name}]",
-    #         f"{orig_path.name.split('.')[0]} = {{ this = '{orig_path.collapseuser().as_posix()}', to_this = '{new_path.collapseuser().as_posix()}' }}",
+    #         f"{orig_path.name.split('.')[0]} = {{ this = '{orig_path.as_posix()}', to_this = '{new_path.as_posix()}' }}",
     #     ]
     # )
     # console.print(

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -52,9 +52,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.57" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.59" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.57" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.59" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -79,7 +79,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=7.57,textual" """
+    else: executable = """--with "machineconfig>=7.59,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/helpers_devops/cli_share_file.py

@@ -12,7 +12,7 @@ Usage examples:
     devops network receive -- --relay 10.17.62.206:443 7121-donor-olympic-bicycle
     devops network receive -- croc --relay 10.17.62.206:443 7121-donor-olympic-bicycle
 """
-    from machineconfig.utils.installer_utils.installer import install_if_missing
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
     install_if_missing(which="croc")
     import platform
     import sys
@@ -100,7 +100,7 @@ def share_file_send(path: Annotated[str, typer.Argument(help="Path to the file o
                     qrcode: Annotated[bool, typer.Option("--qrcode", "--qr", help="Show receive code as a qrcode")] = False,
                     ) -> None:
     """Send a file using croc with relay server."""
-    from machineconfig.utils.installer_utils.installer import install_if_missing
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
     install_if_missing(which="croc")
     # Get relay server IP from environment or use default
     import socket

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/helpers_devops/cli_share_server.py

@@ -40,7 +40,7 @@ def web_file_explorer(
     over_internet: Annotated[bool, typer.Option("--over-internet", "-i", help="Expose the share server over the internet using ngrok")] = False,
     backend: Annotated[str, typer.Option("--backend", "-b", help="Backend to use: filebrowser (default), miniserve, or easy-sharing")] = "filebrowser"
 ) -> None:
-    from machineconfig.utils.installer_utils.installer import install_if_missing
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
     
     if backend not in ["filebrowser", "miniserve", "easy-sharing"]:
         typer.echo(f"❌ ERROR: Invalid backend '{backend}'. Must be one of: filebrowser, miniserve, easy-sharing", err=True)

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/helpers_devops/cli_terminal.py

@@ -60,7 +60,7 @@ def main(
     ssl_ca: Annotated[Optional[str], typer.Option("--ssl-ca", "-A", help="SSL CA file path for client certificate verification")] = None,
     over_internet: Annotated[bool, typer.Option("--over-internet", "-i", help="Expose the terminal over the internet using ngrok")] = False
 ) -> None:
-    from machineconfig.utils.installer_utils.installer import install_if_missing
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
     install_if_missing("ttyd")
     if over_internet: install_if_missing("ngrok")
 

{machineconfig-7.57 → machineconfig-7.59}/src/machineconfig/scripts/python/helpers_devops/cli_utils.py

@@ -2,78 +2,6 @@
 
 import typer
 from typing import Annotated, Optional
-from pathlib import Path
-
-def download(
-    url: Annotated[Optional[str], typer.Argument(..., help="The URL to download the file from.")] = None,
-    decompress: Annotated[bool, typer.Option("--decompress", "-d", help="Decompress the file if it's an archive.")] = False,
-    output: Annotated[Optional[str], typer.Option("--output", "-o", help="The output file path.")] = None,
-) -> None:
-    if url is None:
-        typer.echo("❌ Error: URL is required.", err=True)
-        raise typer.Exit(code=1)
-    typer.echo(f"📥 Downloading from: {url}")    
-    download_path = Path(output) if output else Path(url.split("/")[-1])
-    import requests
-    import subprocess
-    try:
-        response = requests.get(url, allow_redirects=True, stream=True, timeout=60)
-        response.raise_for_status()
-        
-        total_size = int(response.headers.get('content-length', 0))
-        
-        with open(download_path, 'wb') as f:
-            if total_size == 0:
-                f.write(response.content)
-            else:
-                downloaded = 0
-                chunk_size = 8192
-                for chunk in response.iter_content(chunk_size=chunk_size):
-                    if chunk:
-                        f.write(chunk)
-                        downloaded += len(chunk)
-                        progress = (downloaded / total_size) * 100
-                        typer.echo(f"\r⏬ Progress: {progress:.1f}% ({downloaded}/{total_size} bytes)", nl=False)
-                typer.echo()
-        
-        typer.echo(f"✅ Downloaded to: {download_path}")
-    except requests.exceptions.RequestException as e:
-        typer.echo(f"❌ Download failed: {e}", err=True)
-        raise typer.Exit(code=1)
-    except OSError as e:
-        typer.echo(f"❌ File write error: {e}", err=True)
-        raise typer.Exit(code=1)
-    
-    if decompress:
-        typer.echo(f"📦 Decompressing: {download_path}")
-        
-        base_name = download_path.name
-        parts = base_name.split('.')
-        base_name = parts[0] if parts else download_path.stem
-        
-        extract_dir = download_path.parent / base_name
-        extract_dir.mkdir(parents=True, exist_ok=True)
-        
-        try:
-            subprocess.run(
-                ["ouch", "decompress", str(download_path), "--dir", str(extract_dir)],
-                check=True,
-                capture_output=True,
-                text=True
-            )
-            typer.echo(f"✅ Decompressed to: {extract_dir}")
-            
-            if download_path.exists():
-                download_path.unlink()
-                typer.echo(f"🗑️  Removed archive: {download_path}")
-                
-        except subprocess.CalledProcessError as e:
-            typer.echo(f"❌ Decompression failed: {e.stderr}", err=True)
-            raise typer.Exit(code=1)
-        except FileNotFoundError:
-            typer.echo("❌ Error: ouch command not found. Please install ouch.", err=True)
-            typer.echo("💡 Install with: cargo install ouch", err=True)
-            raise typer.Exit(code=1)
 
 
 def merge_pdfs(