machineconfig 3.97__py3-none-any.whl → 3.99__py3-none-any.whl

machineconfig/scripts/python/share_terminal.py

@@ -1,7 +1,7 @@
 
 
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Annotated
 import typer
 from rich.console import Console
 from rich.panel import Panel
@@ -43,12 +43,33 @@ def display_terminal_url(local_ip_v4: str, port: int) -> None:
     )
     
     # Print with extra spacing and attention-grabbing elements
-    console.print("\n" + "🔥" * 60 + "\n", style="bright_red bold")
+    # console.print("\n" + "🔥" * 60 + "\n", style="bright_red bold")
     console.print(panel)
-    console.print("🔥" * 60 + "\n", style="bright_red bold")
-
-
-def main(port: Optional[int]=None, password: Optional[str]=None) -> None:
+    # console.print("🔥" * 60 + "\n", style="bright_red bold")
+
+
+def install_ttyd():
+    # uv run --python 3.13 --with machineconfig devops install ttyd
+    from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
+    exists = check_tool_exists("ttyd")
+    if exists:
+        print("✅ ttyd is already installed.")
+        return
+    print("⏳ ttyd not found. Installing...")
+    from machineconfig.scripts.python.devops_devapps_install import main
+    main(which="ttyd")
+
+
+
+def main(
+    port: Annotated[Optional[int], typer.Option("--port", "-p", help="Port to run the terminal server on (default: 7681)")] = None,
+    username: Annotated[Optional[str], typer.Option("--username", "-u", help="Username for terminal access (default: current user)")] = None,
+    password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for terminal access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None
+) -> None:
+    install_ttyd()
+    if username is None:
+        import getpass
+        username = getpass.getuser()
     if password is None:
         pwd_path = Path.home().joinpath("dotfiles/creds/passwords/quick_password")
         if pwd_path.exists():
@@ -67,11 +88,9 @@ def main(port: Optional[int]=None, password: Optional[str]=None) -> None:
 
     # Display the flashy terminal announcement
     display_terminal_url(local_ip_v4, port)
-
-    code = f"""
-#!/bin/bash
-uv run --python 3.13 --with machineconfig install -ttyd
-ttyd --writable -t enableSixel=true --port {port} --credential "$USER:{password}" -t 'theme={"background": "black"}' bash
+    
+    code = f"""#!/bin/bash
+ttyd --writable -t enableSixel=true --port {port} --credential "{username}:{password}" -t 'theme={{"background": "black"}}' bash
 """
     import subprocess
     subprocess.run(code, shell=True, check=True)

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -2,57 +2,8 @@
 
 echo """
 =======================================================================
-📦 MACHINE CONFIGURATION | Interactive Installation Script
+📦 MACHINE CONFIGURATION | Interactive Installation Script. Installing uv then getting started.
 ======================================================================="""
 
 curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash
-$HOME/.local/bin/uv run --python 3.13 --with machineconfig ia
-
-
-
-
-echo """#=======================================================================
-📂 DOTFILES MIGRATION | Configuration transfer options
-#=======================================================================
-
-🖱️  Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE
-    On original machine, run:
-    cd ~/dotfiles/creds/msc
-    easy-sharing . --password rew --username al
-    Then open brave on new machine to get MouseWithoutBorders password
-
-🔐 Method 2: USING SSH
-    FROM REMOTE, RUN:
-    fptx ~/dotfiles $USER@$(hostname):^ -z
-    # OR, using IP address if router has not yet found the hostname:
-    fptx ~/dotfiles $USER@$(hostname -I | awk '{print $1}'):^ -z
-
-☁️  Method 3: USING INTERNET SECURE SHARE
-    cd ~
-    cloud_copy SHARE_URL . --config ss
-    (requires symlinks to be created first)
-"""
-
-echo """#=======================================================================
-📂 DOTFILES STATUS | Configuration files check
-#=======================================================================
-"""
-read -p "📂 Have you finished copying dotfiles? [y]/n? " choice
-
-echo """#=======================================================================
-🔗 SYMLINK CREATION | Configuration setup
-#=======================================================================
-"""
-read -p "🔗 Create Symlinks (finish dotfiles transfer first) [y]/n? " choice
-choice=${choice:-y}
-if [[ "$choice" == "y" || "$choice" == "Y" ]]; then
-    echo """    🔧 Creating symlinks and setting permissions...
-    """
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.profile.create main_symlinks --choice=all
-    sudo chmod 600 $HOME/.ssh/*
-    sudo chmod 700 $HOME/.ssh
-else
-    echo """    ⏭️  Skipping symlink creation
-    """
-fi
-
+$HOME/.local/bin/uv run --python 3.13 --with machineconfig devops ia

machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -3,189 +3,10 @@ Write-Host "
 📦 Machine Configuration Installation Script
 ============================================="
 
-Write-Host "ℹ️  If you have execution policy issues, run:
-Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
-Write-Host "💡 To accept all prompts automatically, run: `$yesAll = `$true`n"
+Write-Host "ℹ️  If you have execution policy issues, run: Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
 
-
-Write-Host "🔄 Setting up Python environment..."
 Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/ve.ps1" -OutFile "ve.ps1"
 .\ve.ps1
 rm ve.ps1
 
-Write-Host "`n🔄 Setting up repositories..."
-Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/repos.ps1" -OutFile "repos.ps1"
-.\repos.ps1
-rm repos.ps1
-
-Write-Host "`n📂 ============================================
-🔄 DOTFILES MIGRATION OPTIONS
-============================================="
-
-Write-Host "🖱️  Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE
-    On original machine, run:
-    cd ~/dotfiles/creds/msc
-    easy-sharing . --password rew
-    Then open browser on new machine to get MouseWithoutBorders password"
-
-Write-Host "`n🔐 Method 2: USING SSH
-    FROM REMOTE, RUN:
-    ftpx ~/dotfiles `$(hostname):^ -z"
-
-Write-Host "`n💻 For WSL:
-    wsl_server.ps1
-    ftpx ~/dotfiles `$env:USERNAME@localhost:2222 -z
-    # OR:
-    New-Item -ItemType SymbolicLink -Path `$env:USERPROFILE\dotfiles -Target \\wsl`$\Ubuntu\home\`$env:USERNAME\dotfiles"
-
-Write-Host "`n☁️  Method 3: USING INTERNET SECURE SHARE
-    cd ~
-    cloud_copy SHARE_URL . --config ss
-    (requires symlinks to be created first)"
-
-Write-Host "`n----------------------------------------"
-if (-not $yesAll) {
-    $choice = Read-Host "🔒 Install SSH Server [y]/n"
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    Write-Host "`n🔧 Installing and configuring SSH server..."
-    Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
-    Start-Service sshd
-    Set-Service -Name sshd -StartupType 'Automatic'
-    Write-Host "✅ SSH Server installed and configured successfully!"
-} else {
-    Write-Host "⏭️  Skipping SSH server installation"
-}
-
-Write-Host "`n✨ ===========================================
-🎉 Installation Complete!
-============================================="
-
-# Confirm copying finished
-if (-not $yesAll) {
-    $choice = Read-Host "Did you finish copying [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    Write-Host "Proceeding..."
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Create Symlinks
-if (-not $yesAll) {
-    $createLinksChoice = Read-Host "Create (Sym/Hard)links (finish dotfiles transfer first) [y]/n ? "
-} else {
-    $createLinksChoice = "y"
-}
-if ([string]::IsNullOrEmpty($createLinksChoice)) { $createLinksChoice = "y" }
-
-if ($createLinksChoice -eq "y" -or $createLinksChoice -eq "Y") {
-    if (-not $yesAll) {
-        $linkTypeChoice = Read-Host "Create Symlinks (s) or Hardlinks (h) [s]/h ? "
-    } else {
-        $linkTypeChoice = "h"
-    }
-
-    . ~\code\machineconfig\.venv\Scripts\Activate.ps1
-
-    if ($linkTypeChoice -eq "s" -or $linkTypeChoice -eq "S") {
-        python -m fire machineconfig.profile.create main --choice=all
-    } elseif ($linkTypeChoice -eq "h" -or $linkTypeChoice -eq "H") {
-        # python -m fire machineconfig.profile.create_hardlinks main --choice=all
-        python -m fire machineconfig.profile.create main --choice=all
-    } else {
-        Write-Host "Invalid choice for link type. Installation aborted."
-    }
-
-    # icacls "~\.ssh\*" /inheritance:r /grant:r "$($env:USERNAME):(F)"
-    # icacls "~\.ssh" /inheritance:r /grant:r "$($env:USERNAME):(F)"
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Install CLI Apps
-if (-not $yesAll) {
-    $choice = Read-Host "Install CLI Apps [y]/n ? "
-    if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-    if ($choice -eq "y" -or $choice -eq "Y") {
-        . ~\code\machineconfig\src\machineconfig\setup_windows\devapps.ps1
-    } else {
-        Write-Host "Installation aborted."
-    }
-    
-} else {
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main  --which=essentials
-}
-
-
-# Retrieve Repos
-if (-not $yesAll) {
-    $choice = Read-Host "Retrieve Repos at ~/code [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    repos ~\code --clone --cloud odg1
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Retrieve Data
-if (-not $yesAll) {
-    $choice = Read-Host "Retrieve data [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE
-} else {
-    Write-Host "Installation aborted."
-}
-
-
-# Install Brave, WezTerm, and VSCode
-if (-not $yesAll) {
-    $choice = Read-Host "Install Brave+WindowsTerminal+WezTerm+VSCode [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    winget install --no-upgrade --name "Windows Terminal"             --Id "Microsoft.WindowsTerminal"  --source winget --scope user --accept-package-agreements --accept-source-agreements  # Terminal is is installed by default on W 11
-    winget install --no-upgrade --name "Powershell"                   --Id "Microsoft.PowerShell"       --source winget --scope user --accept-package-agreements --accept-source-agreements  # powershell require admin
-    winget install --no-upgrade --name "Brave"                        --Id "Brave.Brave"                --source winget --scope user --accept-package-agreements --accept-source-agreements
-    winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.setup_windows.wt_and_pwsh.install_nerd_fonts main
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.setup_windows.wt_and_pwsh.set_wt_settings main
-} else {
-    Write-Host "Installation aborted."
-}
-
-
-# Install Apps
-if (-not $yesAll) {
-    $choice = Read-Host "Install Windows Apps [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ($choice -eq "y" -or $choice -eq "Y") {
-    Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/apps.ps1" -OutFile "apps.ps1"
-    .\apps.ps1
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Instructions for Thunderbird profile restoration
-# Run this after installing Thunderbird and starting it and shutting it down but before downloading backup
-# cd ~/AppData/Roaming/ThunderBird/Profiles
-# $res = Get-ChildItem
-# $name = $res[0].Name
-# Move-Item $backup_folder $name
+uv run --python 3.13 --with machineconfig devops ia

machineconfig/utils/installer.py

@@ -1,13 +1,13 @@
 """package manager"""
 
-from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_abc import check_if_installed_already
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import APP_INSTALLER_CATEGORY, InstallerData, InstallerDataFiles, get_normalized_arch, get_os_name, OPERATING_SYSTEMS, CPU_ARCHITECTURES
 from rich.console import Console
-from rich.panel import Panel  # Added import
+from rich.panel import Panel
 
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT
+from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT, LINUX_INSTALL_PATH
 from machineconfig.utils.io import read_json
 
 from typing import Any
@@ -38,7 +38,7 @@ def check_latest():
         repo_url = inst.installer_data.get("repoURL", "")
         print(f"🔎 Checking {exe_name}...")
         _release_url, version_to_be_installed = inst.get_github_release(repo_url=repo_url, version=None)
-        verdict, current_ver, new_ver = inst.check_if_installed_already(exe_name=exe_name, version=version_to_be_installed, use_cache=False)
+        verdict, current_ver, new_ver = check_if_installed_already(exe_name=exe_name, version=version_to_be_installed, use_cache=False)
         return exe_name, verdict, current_ver, new_ver
 
     print("\n⏳ Processing installers...\n")
@@ -188,5 +188,4 @@ def install_all(installers: list[Installer], safe: bool = False, jobs: int = 10,
     print("\n" * 2)
 
 
-if __name__ == "__main__":
-    pass
+

machineconfig/utils/installer_utils/installer_abc.py

@@ -1,7 +1,11 @@
+
 from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH
-from typing import Optional
+from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH, INSTALL_VERSION_ROOT
+
+from pathlib import Path
+from typing import Any, Optional
 import subprocess
+import platform
 
 
 def find_move_delete_windows(downloaded_file_path: PathExtended, exe_name: Optional[str] = None, delete: bool = True, rename_to: Optional[str] = None):
@@ -106,3 +110,131 @@ def find_move_delete_linux(downloaded: PathExtended, tool_name: str, delete: Opt
     exe_new_location = PathExtended(LINUX_INSTALL_PATH).joinpath(exe.name)
     print(f"✅ Executable installed at: {exe_new_location}\n{'=' * 80}")
     return exe_new_location
+
+
+def check_tool_exists(tool_name: str) -> bool:
+    if platform.system() == "Windows":
+        tool_name = tool_name.replace(".exe", "") + ".exe"
+        res1 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
+        tool_name = tool_name.replace(".exe", "") + ".exe"
+        res2 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
+        return res1 or res2
+    elif platform.system() in ["Linux", "Darwin"]:
+        root_path = Path(LINUX_INSTALL_PATH)
+        return any([Path("/usr/local/bin").joinpath(tool_name).is_file(), Path("/usr/bin").joinpath(tool_name).is_file(), root_path.joinpath(tool_name).is_file()])
+    else:
+        raise NotImplementedError(f"platform {platform.system()} not implemented")
+
+
+def check_if_installed_already(exe_name: str, version: Optional[str], use_cache: bool) -> tuple[str, str, str]:
+    print(f"\n{'=' * 80}\n🔍 CHECKING INSTALLATION STATUS: {exe_name} 🔍\n{'=' * 80}")
+    INSTALL_VERSION_ROOT.joinpath(exe_name).parent.mkdir(parents=True, exist_ok=True)
+    tmp_path = INSTALL_VERSION_ROOT.joinpath(exe_name)
+
+    if use_cache:
+        print("🗂️  Using cached version information...")
+        if tmp_path.exists():
+            existing_version = tmp_path.read_text(encoding="utf-8").rstrip()
+            print(f"📄 Found cached version: {existing_version}")
+        else:
+            existing_version = None
+            print("ℹ️  No cached version information found")
+    else:
+        print("🔍 Checking installed version directly...")
+        result = subprocess.run([exe_name, "--version"], check=False, capture_output=True, text=True)
+        if result.stdout.strip() == "":
+            existing_version = None
+            print("ℹ️  Could not detect installed version")
+        else:
+            existing_version = result.stdout.strip()
+            print(f"📄 Detected installed version: {existing_version}")
+
+    if existing_version is not None and version is not None:
+        if existing_version == version:
+            print(f"✅ {exe_name} is up to date (version {version})")
+            print(f"📂 Version information stored at: {INSTALL_VERSION_ROOT}")
+            return ("✅ Up to date", version.strip(), version.strip())
+        else:
+            print(f"🔄 {exe_name} needs update: {existing_version.rstrip()} → {version}")
+            tmp_path.write_text(version, encoding="utf-8")
+            return ("❌ Outdated", existing_version.strip(), version.strip())
+    else:
+        print(f"📦 {exe_name} is not installed. Will install version: {version}")
+        # tmp_path.write_text(version, encoding="utf-8")
+
+    print(f"{'=' * 80}")
+    return ("⚠️ NotInstalled", "None", version or "unknown")
+
+
+def parse_apps_installer_linux(txt: str) -> dict[str, Any]:
+    """Parse Linux shell installation scripts into logical chunks.
+    
+    Supports two formats:
+    1. Legacy format with 'yes '' | sed 3q; echo "----------------------------- installing' delimiter
+    2. New format with # --BLOCK:<name>-- comment signatures
+    
+    Returns:
+        dict[str, str]: Dictionary mapping block/section names to their installation scripts
+    """
+    # Try new block format first
+    if "# --BLOCK:" in txt:
+        import re
+        # Split by block signatures: # --BLOCK:<name>--
+        blocks = re.split(r'# --BLOCK:([^-]+)--', txt)
+        res: dict[str, str] = {}
+        
+        # Process blocks in pairs (block_name, block_content)
+        for i in range(1, len(blocks), 2):
+            if i + 1 < len(blocks):
+                block_name = blocks[i].strip()
+                block_content = blocks[i + 1].strip()
+                if block_content:
+                    res[block_name] = block_content
+        
+        return res
+    
+    # Legacy format fallback
+    txts = txt.split("""yes '' | sed 3q; echo "----------------------------- installing """)
+    res = {}
+    for chunk in txts[1:]:
+        try:
+            k = chunk.split("----")[0].rstrip().lstrip()
+            v = "\n".join(chunk.split("\n")[1:])
+            res[k] = v
+        except IndexError as e:
+            print(f"""
+❌ Error parsing chunk:
+{"-" * 50}
+{chunk}
+{"-" * 50}""")
+            raise e
+    return res
+
+
+def parse_apps_installer_windows(txt: str) -> dict[str, Any]:
+    chunks: list[str] = []
+    for idx, item in enumerate(txt.split(sep="winget install")):
+        if idx == 0:
+            continue
+        if idx == 1:
+            chunks.append(item)
+        else:
+            chunks.append("winget install" + item)
+    # progs = L(txt.splitlines()).filter(lambda x: x.startswith("winget ") or x.startswith("#winget"))
+    res: dict[str, str] = {}
+    for a_chunk in chunks:
+        try:
+            name = a_chunk.split("--name ")[1]
+            if "--Id" not in name:
+                print(f"⚠️  Warning: {name} does not have an Id, skipping")
+                continue
+            name = name.split(" --Id ", maxsplit=1)[0].strip('"').strip('"')
+            res[name] = a_chunk
+        except IndexError as e:
+            print(f"""
+❌ Error parsing chunk:
+{"-" * 50}
+{a_chunk}
+{"-" * 50}""")
+            raise e
+    return res

machineconfig/utils/installer_utils/installer_class.py

@@ -1,7 +1,7 @@
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 from machineconfig.utils.installer_utils.installer_abc import find_move_delete_linux, find_move_delete_windows
 from machineconfig.utils.source_of_truth import INSTALL_TMP_DIR, INSTALL_VERSION_ROOT, LIBRARY_ROOT
-from machineconfig.utils.options import check_tool_exists
+from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
 from machineconfig.utils.io import read_json
 from machineconfig.utils.schemas.installer.installer_types import InstallerData, InstallerDataFiles, get_os_name, get_normalized_arch
 
@@ -356,43 +356,3 @@ class Installer:
                 return None, None
         browser_download_url = f"{repo_url}/releases/download/{actual_version}/{filename}"
         return browser_download_url, actual_version
-
-    @staticmethod
-    def check_if_installed_already(exe_name: str, version: Optional[str], use_cache: bool) -> tuple[str, str, str]:
-        print(f"\n{'=' * 80}\n🔍 CHECKING INSTALLATION STATUS: {exe_name} 🔍\n{'=' * 80}")
-        INSTALL_VERSION_ROOT.joinpath(exe_name).parent.mkdir(parents=True, exist_ok=True)
-        tmp_path = INSTALL_VERSION_ROOT.joinpath(exe_name)
-
-        if use_cache:
-            print("🗂️  Using cached version information...")
-            if tmp_path.exists():
-                existing_version = tmp_path.read_text(encoding="utf-8").rstrip()
-                print(f"📄 Found cached version: {existing_version}")
-            else:
-                existing_version = None
-                print("ℹ️  No cached version information found")
-        else:
-            print("🔍 Checking installed version directly...")
-            result = subprocess.run([exe_name, "--version"], check=False, capture_output=True, text=True)
-            if result.stdout.strip() == "":
-                existing_version = None
-                print("ℹ️  Could not detect installed version")
-            else:
-                existing_version = result.stdout.strip()
-                print(f"📄 Detected installed version: {existing_version}")
-
-        if existing_version is not None and version is not None:
-            if existing_version == version:
-                print(f"✅ {exe_name} is up to date (version {version})")
-                print(f"📂 Version information stored at: {INSTALL_VERSION_ROOT}")
-                return ("✅ Up to date", version.strip(), version.strip())
-            else:
-                print(f"🔄 {exe_name} needs update: {existing_version.rstrip()} → {version}")
-                tmp_path.write_text(version, encoding="utf-8")
-                return ("❌ Outdated", existing_version.strip(), version.strip())
-        else:
-            print(f"📦 {exe_name} is not installed. Will install version: {version}")
-            # tmp_path.write_text(version, encoding="utf-8")
-
-        print(f"{'=' * 80}")
-        return ("⚠️ NotInstalled", "None", version or "unknown")

machineconfig/utils/options.py

@@ -1,25 +1,12 @@
 from pathlib import Path
+from machineconfig.utils.installer_utils.installer_abc import check_tool_exists
 from rich.text import Text
 from rich.panel import Panel
 from rich.console import Console
-import platform
 import subprocess
 from typing import Optional, Union, Iterable, overload, Literal
-from machineconfig.utils.source_of_truth import WINDOWS_INSTALL_PATH, LINUX_INSTALL_PATH
-
-
-def check_tool_exists(tool_name: str) -> bool:
-    if platform.system() == "Windows":
-        tool_name = tool_name.replace(".exe", "") + ".exe"
-        res1 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
-        tool_name = tool_name.replace(".exe", "") + ".exe"
-        res2 = any([Path(WINDOWS_INSTALL_PATH).joinpath(tool_name).is_file(), Path.home().joinpath("AppData/Roaming/npm").joinpath(tool_name).is_file()])
-        return res1 or res2
-    elif platform.system() in ["Linux", "Darwin"]:
-        root_path = Path(LINUX_INSTALL_PATH)
-        return any([Path("/usr/local/bin").joinpath(tool_name).is_file(), Path("/usr/bin").joinpath(tool_name).is_file(), root_path.joinpath(tool_name).is_file()])
-    else:
-        raise NotImplementedError(f"platform {platform.system()} not implemented")
+
+
     # _ = cmd
     #     cmd = "where.exe"
     #     cmd = "which"

{machineconfig-3.97.dist-info → machineconfig-3.99.dist-info}/METADATA

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