machineconfig 5.18__py3-none-any.whl → 5.20__py3-none-any.whl

machineconfig/profile/create.py

@@ -4,6 +4,7 @@ This script Takes away all config files from the computer, place them in one dir
 
 """
 
+from machineconfig.utils.links import OperationRecord
 from rich.console import Console
 from rich.panel import Panel
 from rich.pretty import Pretty
@@ -12,7 +13,7 @@ from rich.table import Table
 
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.links import symlink_map, copy_map
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_PATH
 
 import platform
 import subprocess
@@ -40,7 +41,6 @@ class Base(TypedDict):
     to_this: str
     contents: Optional[bool]
     copy: Optional[bool]
-
 class ConfigMapper(TypedDict):
     file_name: str
     config_file_default_path: str
@@ -74,31 +74,6 @@ def read_mapper() -> MapperFileData:
     return {"public": public, "private": private}
 
 
-class OperationRecord(TypedDict):
-    program: str
-    file_key: str
-    source: str
-    target: str
-    operation: str
-    action: Literal[
-        "already_linked",
-        "relinking", 
-        "fixing_broken_link",
-        "identical_files",
-        "backing_up_source",
-        "backing_up_target", 
-        "relinking_to_new_target",
-        "moving_to_target",
-        "new_link",
-        "new_link_and_target",
-        "linking",
-        "copying",
-        "error"
-    ]
-    details: str
-    status: str
-
-
 def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
                  on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"],
                  method: Literal["symlink", "copy"]
@@ -135,80 +110,104 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
             self_managed_config_file_path = PathExtended(a_mapper["self_managed_config_file_path"].replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
             
             # Determine whether to use copy or symlink
-            use_copy = method == "copy" or "copy" in a_mapper
+            use_copy = method == "copy" or a_mapper.get("copy", False)
             
             if "contents" in a_mapper:
-                try:
-                    targets = list(self_managed_config_file_path.expanduser().search("*"))
-                    for a_target in targets:
+                targets = list(self_managed_config_file_path.expanduser().search("*"))
+                for a_target in targets:
+                    operation_type = "contents_copy" if use_copy else "contents_symlink"
+                    try:
                         if use_copy:
                             result = copy_map(config_file_default_path=config_file_default_path.joinpath(a_target.name), self_managed_config_file_path=a_target, on_conflict=on_conflict)
-                            operation_type = "contents_copy"
                         else:
                             result = symlink_map(config_file_default_path=config_file_default_path.joinpath(a_target.name), self_managed_config_file_path=a_target, on_conflict=on_conflict)
-                            operation_type = "contents_symlink"
                         operation_records.append({
                             "program": program_name,
                             "file_key": a_mapper["file_name"],
-                            "source": str(config_file_default_path.joinpath(a_target.name)),
-                            "target": str(a_target),
+                            "defaultPath": str(config_file_default_path.joinpath(a_target.name)),
+                            "selfManaged": str(a_target),
                             "operation": operation_type,
                             "action": result["action"],
                             "details": result["details"],
                             "status": "success"
                         })
-                except Exception as ex:
-                    console.print(f"❌ [red]Config error[/red]: {program_name} | {a_mapper['file_name']} | missing keys 'config_file_default_path ==> self_managed_config_file_path'. {ex}")
-                    operation_records.append({
-                        "program": program_name,
-                        "file_key": a_mapper["file_name"],
-                        "source": str(config_file_default_path),
-                        "target": str(self_managed_config_file_path),
-                        "operation": "contents_symlink" if not use_copy else "contents_copy",
-                        "action": "error",
-                        "details": f"Failed to process contents: {str(ex)}",
-                        "status": f"error: {str(ex)}"
-                    })                    
+                    except ValueError as ex:
+                        if "resolve to the same location" in str(ex):
+                            operation_records.append({
+                                "program": program_name,
+                                "file_key": a_mapper["file_name"],
+                                "defaultPath": str(config_file_default_path.joinpath(a_target.name)),
+                                "selfManaged": str(a_target),
+                                "operation": operation_type,
+                                "action": "already_linked",
+                                "details": "defaultPath and selfManaged resolve to same location - already correctly configured",
+                                "status": "success"
+                            })
+                        else:
+                            raise
+                    except Exception as ex:
+                        console.print(f"❌ [red]Config error[/red]: {program_name} | {a_mapper['file_name']} | {a_target.name}. {ex}")
+                        operation_records.append({
+                            "program": program_name,
+                            "file_key": a_mapper["file_name"],
+                            "defaultPath": str(config_file_default_path.joinpath(a_target.name)),
+                            "selfManaged": str(a_target),
+                            "operation": operation_type,
+                            "action": "error",
+                            "details": f"Failed to process contents: {str(ex)}",
+                            "status": f"error: {str(ex)}"
+                        })                    
             else:
+                operation_type = "copy" if use_copy else "symlink"
                 try:
                     if use_copy:
                         result = copy_map(config_file_default_path=config_file_default_path, self_managed_config_file_path=self_managed_config_file_path, on_conflict=on_conflict)
-                        operation_type = "copy"
                     else:
                         result = symlink_map(config_file_default_path=config_file_default_path, self_managed_config_file_path=self_managed_config_file_path, on_conflict=on_conflict)
-                        operation_type = "symlink"
                     operation_records.append({
                         "program": program_name,
                         "file_key": a_mapper["file_name"],
-                        "source": str(config_file_default_path),
-                        "target": str(self_managed_config_file_path),
+                        "defaultPath": str(config_file_default_path),
+                        "selfManaged": str(self_managed_config_file_path),
                         "operation": operation_type,
                         "action": result["action"],
                         "details": result["details"],
                         "status": "success"
                     })
+                except ValueError as ex:
+                    if "resolve to the same location" in str(ex):
+                        operation_records.append({
+                            "program": program_name,
+                            "file_key": a_mapper["file_name"],
+                            "defaultPath": str(config_file_default_path),
+                            "selfManaged": str(self_managed_config_file_path),
+                            "operation": operation_type,
+                            "action": "already_linked",
+                            "details": "defaultPath and selfManaged resolve to same location - already correctly configured",
+                            "status": "success"
+                        })
+                    else:
+                        raise
                 except Exception as ex:
-                    console.print(f"❌ [red]Config error[/red]: {program_name} | {a_mapper['file_name']} | missing keys 'config_file_default_path ==> self_managed_config_file_path'. {ex}")
+                    console.print(f"❌ [red]Config error[/red]: {program_name} | {a_mapper['file_name']} | {ex}")
                     operation_records.append({
                         "program": program_name,
                         "file_key": a_mapper["file_name"],
-                        "source": str(config_file_default_path),
-                        "target": str(self_managed_config_file_path),
-                        "operation": "symlink" if not use_copy else "copy",
+                        "defaultPath": str(config_file_default_path),
+                        "selfManaged": str(self_managed_config_file_path),
+                        "operation": operation_type,
                         "action": "error",
-                        "details": f"Failed to create {'symlink' if not use_copy else 'copy'}: {str(ex)}",
+                        "details": f"Failed to create {operation_type}: {str(ex)}",
                         "status": f"error: {str(ex)}"
                     })
 
             if program_name == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
                 try:
                     console.print("\n[bold]🔒 Setting secure permissions for SSH files...[/bold]")
-                    # run_shell_script("sudo chmod 600 $HOME/.ssh/*")
-                    # run_shell_script("sudo chmod 700 $HOME/.ssh")
-
-                    subprocess.run("chmod 700 ~/.ssh/", check=True)
-                    subprocess.run("chmod 700 ~/dotfiles/creds/.ssh/", check=True)  # may require sudo
-                    subprocess.run("chmod 600 ~/dotfiles/creds/.ssh/*", check=True)
+                    subprocess.run("chmod 700 $HOME/.ssh/", shell=True, check=True)
+                    subprocess.run("chmod 700 $HOME/dotfiles/creds/.ssh/", shell=True, check=True)
+                    subprocess.run("chmod 600 $HOME/dotfiles/creds/.ssh/*", shell=True, check=True)
+                    subprocess.run("chmod 600 $HOME/.ssh/*", shell=True, check=True)
                     console.print("[green]✅ SSH permissions set successfully[/green]")
                 except Exception as e:
                     ERROR_LIST.append(e)
@@ -224,8 +223,8 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
         table = Table(title="🔗 Symlink Operations Summary", show_header=True, header_style="bold magenta")
         table.add_column("Program", style="cyan", no_wrap=True)
         table.add_column("File Key", style="blue", no_wrap=True)
-        table.add_column("Source", style="green")
-        table.add_column("Target", style="yellow")
+        table.add_column("Default Path", style="green")
+        table.add_column("Self Managed", style="yellow")
         table.add_column("Operation", style="magenta", no_wrap=True)
         table.add_column("Action", style="red", no_wrap=True)
         table.add_column("Details", style="white")
@@ -237,8 +236,8 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
             table.add_row(
                 record["program"],
                 record["file_key"],
-                record["source"],
-                record["target"],
+                record["defaultPath"],
+                record["selfManaged"],
                 record["operation"],
                 f"[{action_style}]{record['action']}[/{action_style}]",
                 record["details"],
@@ -247,6 +246,25 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
         
         console.print("\n")
         console.print(table)
+        
+        # Export operation records to CSV
+        import csv
+        from datetime import datetime
+        
+        csv_dir = PathExtended(CONFIG_PATH).joinpath("symlink_operations")
+        csv_dir.mkdir(parents=True, exist_ok=True)
+        
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        csv_filename = f"symlink_operations_{timestamp}.csv"
+        csv_path = csv_dir.joinpath(csv_filename)
+        
+        with open(csv_path, "w", newline="", encoding="utf-8") as csvfile:
+            fieldnames = ["program", "file_key", "defaultPath", "selfManaged", "operation", "action", "details", "status"]
+            writer = csv.DictWriter(csvfile, fieldnames=fieldnames)
+            writer.writeheader()
+            writer.writerows(operation_records)
+        
+        console.print(f"\n[bold green]📊 Operations exported to CSV:[/bold green] [cyan]{csv_path}[/cyan]")
 
     if len(ERROR_LIST) > 0:
         console.print(

machineconfig/scripts/python/devops.py

@@ -1,33 +1,32 @@
 """devops with emojis"""
 
-import machineconfig.utils.installer_utils.installer as installer_entry_point
 import machineconfig.scripts.python.share_terminal as share_terminal
 import machineconfig.scripts.python.repos as repos
-
-import machineconfig.profile.create_frontend as create_frontend
+from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS
 # import machineconfig.scripts.python.dotfile as dotfile_module
 import typer
-from typing import Literal, Annotated
+from typing import Literal, Annotated, Optional, get_args
 
 
 app = typer.Typer(help="🛠️ DevOps operations", no_args_is_help=True)
-app.command(name="install", help="📦 Install essential packages")(installer_entry_point.main)
-app.add_typer(repos.app, name="repos", help="📁 Manage git repositories")
+@app.command(no_args_is_help=True)
+def install(    which: Optional[str] = typer.Option(None, "--which", "-w", help="Comma-separated list of program names to install."),
+    group: Optional[PACKAGE_GROUPS] = typer.Option(None, "--group", "-g", help=f"Group name (one of {list(get_args(PACKAGE_GROUPS))})"),
+    interactive: bool = typer.Option(False, "--interactive", "-ia", help="Interactive selection of programs to install."),
+) -> None:
+    """📦 Install essential packages"""
+    import machineconfig.utils.installer_utils.installer as installer_entry_point
+    installer_entry_point.main(which=which, group=group, interactive=interactive)
 
 
+app.add_typer(repos.app, name="repos", help="📁 Manage git repositories")
 config_apps = typer.Typer(help="⚙️ Configuration subcommands", no_args_is_help=True)
 app.add_typer(config_apps, name="config")
-
-
-
 app_data = typer.Typer(help="💾 Data subcommands", no_args_is_help=True)
 app.add_typer(app_data, name="data")
-
 nw_apps = typer.Typer(help="🔐 Network subcommands", no_args_is_help=True)
 nw_apps.command(name="share-terminal", help="📡 Share terminal via web browser")(share_terminal.main)
 app.add_typer(nw_apps, name="network")
-
-
 self_app = typer.Typer(help="🔄 SELF operations subcommands", no_args_is_help=True)
 app.add_typer(self_app, name="self")
 
@@ -46,17 +45,35 @@ def interactive():
 def status():
     """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
     pass
+@self_app.command()
+def clone():
+    """📋 CLONE machienconfig locally for faster execution and nightly updates. """
+    import platform
+    from machineconfig.utils.code import run_shell_script
+    if platform.system() == "Windows":
+        from machineconfig.setup_windows import REPOS
+    else:
+        from machineconfig.setup_linux import REPOS
+    run_shell_script(REPOS.read_text(encoding="utf-8"))
 
 
 @config_apps.command(no_args_is_help=True)
-def private():
+def private(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for linking files"),
+                             on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
+                             which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
+                             interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
     """🔗 Manage private configuration files."""
-    create_frontend.main_private_from_parser()
+    import machineconfig.profile.create_frontend as create_frontend
+    create_frontend.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
 @config_apps.command(no_args_is_help=True)
-def public():
+def public(method: Literal["symlink", "copy"] = typer.Option(..., "--method", "-m", help="Method to use for setting up the config file."),
+                            on_conflict: Literal["throwError", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", "--on-conflict", "-o", help="Action to take on conflict"),
+                            which: Optional[str] = typer.Option(None, "--which", "-w", help="Specific items to process"),
+                            interactive: bool = typer.Option(False, "--interactive", "-ia", help="Run in interactive mode")):
     """🔗 Manage public configuration files."""
-    create_frontend.main_public_from_parser()
+    import machineconfig.profile.create_frontend as create_frontend
+    create_frontend.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
 # @config_apps.command(no_args_is_help=True)
 # def dotfile():

machineconfig/scripts/python/interactive.py

@@ -19,8 +19,8 @@ for better user experience with checkbox selections.
 
 import sys
 from pathlib import Path
-from platform import system
 from typing import cast
+import platform
 
 import questionary
 from questionary import Choice
@@ -80,14 +80,14 @@ def get_installation_choices() -> list[str]:
         Choice(value="retrieve_data", title="💾 Retrieve Data                  - Backup restoration", checked=False),
     ]
     # Add Windows-specific options
-    if system() == "Windows":
+    if platform.system() == "Windows":
         choices.append(Choice(value="install_windows_desktop", title="💻 Install Windows Desktop Apps   - Brave, Windows Terminal, PowerShell, VSCode (Windows only)", checked=False))
     selected = questionary.checkbox("Select the installation options you want to execute:", choices=choices, show_description=True).ask()
     return selected or []
 
 
 def execute_installations(selected_options: list[str]) -> None:
-    if system() == "Windows":
+    if platform.system() == "Windows":
         from machineconfig import setup_windows as module
         script_path = Path(module.__file__).parent / "ve.ps1"
         run_shell_script(script_path.read_text(encoding="utf-8"))
@@ -109,26 +109,24 @@ def execute_installations(selected_options: list[str]) -> None:
             run_shell_script(". $HOME/.bashrc")
 
     if "upgrade_system" in selected_options:
-        if system() == "Windows":
+        if platform.system() == "Windows":
             console.print("❌ System upgrade is not applicable on Windows via this script.", style="bold red")
-        elif system() == "Linux":
+        elif platform.system() == "Linux":
             console.print(Panel("🔄 [bold magenta]SYSTEM UPDATE[/bold magenta]\n[italic]Package management[/italic]", border_style="magenta"))
             run_shell_script("sudo nala upgrade -y")
         else:
-            console.print(f"❌ System upgrade not supported on {system()}.", style="bold red")
+            console.print(f"❌ System upgrade not supported on {platform.system()}.", style="bold red")
     if "install_repos" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
-        if system() == "Windows":
-            from machineconfig import setup_windows as module
-            script_path = Path(module.__file__).parent / "repos.ps1"
+        if platform.system() == "Windows":
+            from machineconfig.setup_windows import REPOS
         else:
-            from machineconfig import setup_linux as module
-            script_path = Path(module.__file__).parent / "repos.sh"
-        run_shell_script(script_path.read_text(encoding="utf-8"))
+            from machineconfig.setup_linux import REPOS
+        run_shell_script(REPOS.read_text(encoding="utf-8"))
 
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
-        if system() == "Windows":
+        if platform.system() == "Windows":
             powershell_script = """Write-Host "🔧 Installing and configuring SSH server..."
 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
 Start-Service sshd
@@ -142,7 +140,7 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         console.print("🔧 Configuring shell profile", style="bold cyan")
         try:
             from machineconfig.profile.shell import create_default_shell_profile
-            create_default_shell_profile()
+            create_default_shell_profile(method="copy")
             console.print("✅ Shell profile configured successfully", style="bold green")
         except Exception as e:
             console.print(f"❌ Error configuring shell profile: {e}", style="bold red")

machineconfig/scripts/python/repos.py

@@ -35,7 +35,7 @@ CloudOption = Annotated[
 
 
 
-@app.command()
+@app.command(no_args_is_help=True)
 def push(directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
     no_sync: NoSyncOption = False,
@@ -43,7 +43,7 @@ def push(directory: DirectoryArgument = None,
     """🚀 Push changes across repositories."""
     from machineconfig.scripts.python.repos_helper import git_operations
     git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, no_sync=no_sync)
-@app.command()
+@app.command(no_args_is_help=True)
 def pull(
     directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
@@ -52,7 +52,7 @@ def pull(
     """⬇️ Pull changes across repositories."""
     from machineconfig.scripts.python.repos_helper import git_operations
     git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, no_sync=no_sync)
-@app.command()
+@app.command(no_args_is_help=True)
 def commit(
     directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
@@ -61,8 +61,8 @@ def commit(
     """💾 Commit changes across repositories."""
     from machineconfig.scripts.python.repos_helper import git_operations
     git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, no_sync=no_sync)
-@app.command()
-def all(
+@app.command(no_args_is_help=True)
+def cleanup(
     directory: DirectoryArgument = None,
     recursive: RecursiveOption = False,
     no_sync: NoSyncOption = False,
@@ -72,7 +72,7 @@ def all(
     git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, no_sync=no_sync)
 
 
-@sync_app.command()
+@sync_app.command(no_args_is_help=True)
 def capture(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -86,7 +86,7 @@ def capture(
     from machineconfig.utils.path_extended import PathExtended
     if cloud is not None:
         PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
-@sync_app.command()
+@sync_app.command(no_args_is_help=True)
 def clone(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -97,7 +97,7 @@ def clone(
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
 
 
-@sync_app.command(name="checkout-to-commit")
+@sync_app.command(name="checkout-to-commit", no_args_is_help=True)
 def checkout_command(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -108,7 +108,7 @@ def checkout_command(
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=True)
 
 
-@sync_app.command(name="checkout-to-branch")
+@sync_app.command(name="checkout-to-branch", no_args_is_help=True)
 def checkout_to_branch_command(
     directory: DirectoryArgument = None,
     cloud: CloudOption = None,
@@ -119,7 +119,7 @@ def checkout_to_branch_command(
     clone_from_specs(directory, cloud, checkout_branch_flag=True, checkout_commit_flag=False)
 
 
-@app.command()
+@app.command(no_args_is_help=True)
 def analyze(
     directory: DirectoryArgument = None,
 ) -> None:

machineconfig/utils/links.py

@@ -8,39 +8,40 @@ from typing import TypedDict, Literal
 console = Console()
 
 
-class SymlinkResult(TypedDict):
-    action: Literal[
-        "already_linked",
-        "relinking", 
-        "fixing_broken_link",
-        "identical_files",
-        "backing_up_source",
-        "backing_up_target", 
-        "relinking_to_new_target",
-        "moving_to_target",
-        "new_link",
-        "new_link_and_target",
-        "linking",
-        "error"
-    ]
-    details: str
+ActionType = Literal[
+    "already_linked",
+    "relinking",
+    "fixing_broken_link",
+    "identical_files",
+    "backupConfigDefaultPath",
+    "backing_up_source",
+    "backing_up_target",
+    "relink2newSelfManagedPath",
+    "relinking_to_new_target",
+    "move2selfManagedPath",
+    "moving_to_target",
+    "new_link",
+    "newLinkAndSelfManagedPath",
+    "new_link_and_target",
+    "linking",
+    "copying",
+    "error"
+]
+
 
+class OperationResult(TypedDict):
+    action: ActionType
+    details: str
 
-class CopyResult(TypedDict):
-    action: Literal[
-        "already_linked",
-        "relinking",
-        "fixing_broken_link", 
-        "backing_up_source",
-        "backing_up_target",
-        "relinking_to_new_target",
-        "moving_to_target",
-        "new_link",
-        "new_link_and_target",
-        "copying",
-        "error"
-    ]
+class OperationRecord(TypedDict):
+    action: ActionType
     details: str
+    program: str
+    file_key: str
+    defaultPath: str
+    selfManaged: str
+    operation: str
+    status: str
 
 
 def files_are_identical(file1: PathExtended, file2: PathExtended) -> bool:
@@ -79,14 +80,24 @@ def build_links(target_paths: list[tuple[PLike, str]], repo_root: PLike):
     tmp_results_root.mkdir(parents=True, exist_ok=True)
     target_dirs_filtered.append((tmp_results_root, "tmp_results"))
 
+    links_dir = repo_root_obj.joinpath("links")
+    links_dir.mkdir(parents=True, exist_ok=True)
+    
     for a_target_path, a_name in target_dirs_filtered:
-        links_path = repo_root_obj.joinpath("links", a_name)
-        links_path.symlink_to(target=a_target_path)
+        links_path = links_dir.joinpath(a_name)
+        if links_path.exists() or links_path.is_symlink():
+            if links_path.is_symlink() and links_path.resolve() == a_target_path.resolve():
+                continue
+            links_path.unlink(missing_ok=True)
+        try:
+            links_path.symlink_to(target=a_target_path)
+        except OSError as ex:
+            console.print(Panel(f"❌ Failed to create symlink {links_path} -> {a_target_path}: {ex}", title="Symlink Error", expand=False))
 
 
 def symlink_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended,
                  on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]
-                 ) -> SymlinkResult:
+                 ) -> OperationResult:
     """helper function. creates a symlink from `config_file_default_path` to `self_managed_config_file_path`.
 
     Returns a dict with 'action' and 'details' keys describing what was done.
@@ -103,6 +114,10 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
     """
     config_file_default_path = PathExtended(config_file_default_path).expanduser().absolute()
     self_managed_config_file_path = PathExtended(self_managed_config_file_path).expanduser().absolute()
+    
+    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
+        raise ValueError(f"config_file_default_path and self_managed_config_file_path resolve to the same location: {config_file_default_path.resolve()}")
+    
     action_taken = ""
     details = ""
     
@@ -112,7 +127,7 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
             if config_file_default_path.is_symlink():
                 # Check if symlink already points to correct target
                 try:
-                    if config_file_default_path.readlink().resolve() == self_managed_config_file_path.resolve():
+                    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
                         # Case: config_file_default_path exists AND self_managed_config_file_path exists AND config_file_default_path is a symlink pointing to self_managed_config_file_path
                         action_taken = "already_linked"
                         details = "Symlink already correctly points to target"
@@ -135,7 +150,7 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                 if files_are_identical(config_file_default_path, self_managed_config_file_path):
                     # Files are identical, just delete this and create symlink
                     action_taken = "identical_files"
-                    details = "Files identical, removed source and will create symlink"
+                    details = "Files identical, removed config_file_default_path and will create symlink"
                     console.print(Panel(f"🔗 IDENTICAL FILES | Files are identical, deleting {config_file_default_path} and creating symlink to {self_managed_config_file_path}", title="Identical Files", expand=False))
                     config_file_default_path.delete(sure=True)
                 else:
@@ -156,13 +171,13 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                         self_managed_config_file_path.move(path=backup_name)
                         config_file_default_path.move(path=self_managed_config_file_path)
                     elif on_conflict == "overwriteDefaultPath":
-                        action_taken = "backing_up_source"
+                        action_taken = "backupConfigDefaultPath"
                         details = "Overwriting default path, creating symlink to self-managed config"
                         console.print(Panel(f"📦 OVERWRITE DEFAULT | Deleting {config_file_default_path}, creating symlink to {self_managed_config_file_path}", title="Overwrite Default", expand=False))
                         config_file_default_path.delete(sure=True)
                     elif on_conflict == "backupDefaultPath":
                         backup_name = f"{config_file_default_path}.orig_{randstr()}"
-                        action_taken = "backing_up_source"
+                        action_taken = "backupConfigDefaultPath"
                         details = f"Backed up default path to {backup_name}"
                         console.print(Panel(f"📦 BACKUP DEFAULT | Moving {config_file_default_path} to {backup_name}, creating symlink to {self_managed_config_file_path}", title="Backup Default", expand=False))
                         config_file_default_path.move(path=backup_name)
@@ -170,8 +185,8 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
             # self_managed_config_file_path doesn't exist
             if config_file_default_path.is_symlink():
                 # Case: config_file_default_path exists AND self_managed_config_file_path doesn't exist AND config_file_default_path is a symlink (pointing anywhere)
-                action_taken = "relinking_to_new_target"
-                details = "Removed existing symlink, will create target and new symlink"
+                action_taken = "relink2newSelfManagedPath"
+                details = "Removed existing symlink, will create self_managed_config_file_path and new symlink"
                 console.print(Panel(f"🔄 RELINKING | Updating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Relinking", expand=False))
                 config_file_default_path.delete(sure=True)
                 # Create self_managed_config_file_path
@@ -179,8 +194,8 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
                 self_managed_config_file_path.touch()
             else:
                 # Case: config_file_default_path exists AND self_managed_config_file_path doesn't exist AND config_file_default_path is a concrete path
-                action_taken = "moving_to_target"
-                details = "Moved source to target location, will create symlink"
+                action_taken = "move2selfManagedPath"
+                details = "Moved config_file_default_path to self_managed_config_file_path location, will create symlink"
                 console.print(Panel(f"📁 MOVING | Moving {config_file_default_path} to {self_managed_config_file_path}, then creating symlink", title="Moving", expand=False))
                 config_file_default_path.move(path=self_managed_config_file_path)
     else:
@@ -188,22 +203,23 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
         if self_managed_config_file_path.exists():
             # Case: config_file_default_path doesn't exist AND self_managed_config_file_path exists
             action_taken = "new_link"
-            details = "Creating new symlink to existing target"
+            details = "Creating new symlink to existing self_managed_config_file_path"
             console.print(Panel(f"🆕 NEW LINK | Creating new symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="New Link", expand=False))
         else:
             # Case: config_file_default_path doesn't exist AND self_managed_config_file_path doesn't exist
-            action_taken = "new_link_and_target"
-            details = "Creating target file and new symlink"
+            action_taken = "newLinkAndSelfManagedPath"
+            details = "Creating self_managed_config_file_path file and new symlink"
             console.print(Panel(f"🆕 NEW LINK & TARGET | Creating {self_managed_config_file_path} and symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="New Link & Target", expand=False))
             self_managed_config_file_path.parent.mkdir(parents=True, exist_ok=True)
             self_managed_config_file_path.touch()
     
     # Create the symlink
     try:
-        action_taken = action_taken or "linking"
-        details = details or "Creating symlink"
-        console.print(Panel(f"🔗 LINKING | Creating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Linking", expand=False))
-        PathExtended(config_file_default_path).symlink_to(target=self_managed_config_file_path, verbose=True, overwrite=True)
+        if not action_taken:
+            action_taken = "linking"
+            details = "Creating symlink"
+            console.print(Panel(f"🔗 LINKING | Creating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Linking", expand=False))
+        PathExtended(config_file_default_path).symlink_to(target=self_managed_config_file_path, verbose=True, overwrite=False)
         return {"action": action_taken, "details": details}
     except Exception as ex:
         action_taken = "error"
@@ -212,87 +228,105 @@ def symlink_map(config_file_default_path: PathExtended, self_managed_config_file
         return {"action": action_taken, "details": details}
 
 
-def copy_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended, on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]) -> CopyResult:
+def copy_map(config_file_default_path: PathExtended, self_managed_config_file_path: PathExtended, on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"]) -> OperationResult:
     config_file_default_path = PathExtended(config_file_default_path).expanduser().absolute()
     self_managed_config_file_path = PathExtended(self_managed_config_file_path).expanduser().absolute()
+    
+    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
+        raise ValueError(f"config_file_default_path and self_managed_config_file_path resolve to the same location: {config_file_default_path.resolve()}")
+    
     action_taken = ""
     details = ""
     
-    if config_file_default_path.exists():
-        if self_managed_config_file_path.exists():
+    match (config_file_default_path.exists(), self_managed_config_file_path.exists()):
+        case (True, True):
+            # Both files exist
             if config_file_default_path.is_symlink():
                 try:
-                    if config_file_default_path.readlink().resolve() == self_managed_config_file_path.resolve():
+                    if config_file_default_path.resolve() == self_managed_config_file_path.resolve():
                         action_taken = "already_linked"
-                        details = "Symlink already correctly points to target"
-                        console.print(Panel(f"✅ ALREADY LINKED | {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Already Linked", expand=False))
+                        details = "File at default path is already a symlink to self-managed config"
+                        console.print(Panel(f"✅ ALREADY CORRECT | {config_file_default_path} already points to {self_managed_config_file_path}", title="Already Correct", expand=False))
                         return {"action": action_taken, "details": details}
                     else:
                         action_taken = "relinking"
-                        details = "Updated existing symlink to point to new target"
-                        console.print(Panel(f"🔄 RELINKING | Updating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Relinking", expand=False))
+                        details = "Removing symlink at default path that points elsewhere"
+                        console.print(Panel(f"🔄 REMOVING SYMLINK | Removing symlink {config_file_default_path} (points elsewhere), will copy from {self_managed_config_file_path}", title="Removing Symlink", expand=False))
                         config_file_default_path.delete(sure=True)
                 except OSError:
                     action_taken = "fixing_broken_link"
-                    details = "Removed broken symlink and will create new one"
-                    console.print(Panel(f"🔄 FIXING BROKEN LINK | Fixing broken symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Fixing Broken Link", expand=False))
+                    details = "Removed broken symlink at default path"
+                    console.print(Panel(f"🔄 FIXING BROKEN SYMLINK | Removing broken symlink {config_file_default_path}, will copy from {self_managed_config_file_path}", title="Fixing Broken Symlink", expand=False))
                     config_file_default_path.delete(sure=True)
             else:
-                if on_conflict == "throwError":
-                    raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")
-                elif on_conflict == "overwriteSelfManaged":
-                    action_taken = "backing_up_target"
-                    details = "Overwriting self-managed config, moving default path to self-managed location"
-                    console.print(Panel(f"📦 OVERWRITE SELF-MANAGED | Deleting {self_managed_config_file_path}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Overwrite Self-Managed", expand=False))
-                    self_managed_config_file_path.delete(sure=True)
-                    config_file_default_path.move(path=self_managed_config_file_path)
-                elif on_conflict == "backupSelfManaged":
-                    backup_name = f"{self_managed_config_file_path}.orig_{randstr()}"
-                    action_taken = "backing_up_target"
-                    details = f"Backed up self-managed config to {backup_name}"
-                    console.print(Panel(f"📦 BACKUP SELF-MANAGED | Moving {self_managed_config_file_path} to {backup_name}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Backup Self-Managed", expand=False))
-                    self_managed_config_file_path.move(path=backup_name)
-                    config_file_default_path.move(path=self_managed_config_file_path)
-                elif on_conflict == "overwriteDefaultPath":
-                    action_taken = "backing_up_source"
-                    details = "Overwriting default path, creating symlink to self-managed config"
-                    console.print(Panel(f"📦 OVERWRITE DEFAULT | Deleting {config_file_default_path}, copying {self_managed_config_file_path}", title="Overwrite Default", expand=False))
+                # Check if files are identical first
+                if files_are_identical(config_file_default_path, self_managed_config_file_path):
+                    # Files are identical, just delete this and proceed with copy
+                    action_taken = "identical_files"
+                    details = "Files identical, removed config_file_default_path and will copy"
+                    console.print(Panel(f"🔗 IDENTICAL FILES | Files are identical, deleting {config_file_default_path} and copying from {self_managed_config_file_path}", title="Identical Files", expand=False))
                     config_file_default_path.delete(sure=True)
-                elif on_conflict == "backupDefaultPath":
-                    backup_name = f"{config_file_default_path}.orig_{randstr()}"
-                    action_taken = "backing_up_source"
-                    details = f"Backed up default path to {backup_name}"
-                    console.print(Panel(f"📦 BACKUP DEFAULT | Moving {config_file_default_path} to {backup_name}, copying {self_managed_config_file_path}", title="Backup Default", expand=False))
-                    config_file_default_path.move(path=backup_name)
-        else:
+                else:
+                    # Files are different, use on_conflict strategy
+                    match on_conflict:
+                        case "throwError":
+                            raise RuntimeError(f"Conflict detected: {config_file_default_path} and {self_managed_config_file_path} both exist with different content")
+                        case "overwriteSelfManaged":
+                            action_taken = "backing_up_target"
+                            details = "Overwriting self-managed config with default path content"
+                            console.print(Panel(f"📦 OVERWRITE SELF-MANAGED | Deleting {self_managed_config_file_path}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Overwrite Self-Managed", expand=False))
+                            self_managed_config_file_path.delete(sure=True)
+                            config_file_default_path.move(path=self_managed_config_file_path)
+                        case "backupSelfManaged":
+                            backup_name = f"{self_managed_config_file_path}.orig_{randstr()}"
+                            action_taken = "backing_up_target"
+                            details = f"Backed up self-managed config to {backup_name}"
+                            console.print(Panel(f"📦 BACKUP SELF-MANAGED | Moving {self_managed_config_file_path} to {backup_name}, moving {config_file_default_path} to {self_managed_config_file_path}", title="Backup Self-Managed", expand=False))
+                            self_managed_config_file_path.move(path=backup_name)
+                            config_file_default_path.move(path=self_managed_config_file_path)
+                        case "overwriteDefaultPath":
+                            action_taken = "backupConfigDefaultPath"
+                            details = "Overwriting default path with self-managed config"
+                            console.print(Panel(f"📦 OVERWRITE DEFAULT | Deleting {config_file_default_path}, will copy from {self_managed_config_file_path}", title="Overwrite Default", expand=False))
+                            config_file_default_path.delete(sure=True)
+                        case "backupDefaultPath":
+                            backup_name = f"{config_file_default_path}.orig_{randstr()}"
+                            action_taken = "backupConfigDefaultPath"
+                            details = f"Backed up default path to {backup_name}"
+                            console.print(Panel(f"📦 BACKUP DEFAULT | Moving {config_file_default_path} to {backup_name}, will copy from {self_managed_config_file_path}", title="Backup Default", expand=False))
+                            config_file_default_path.move(path=backup_name)
+        case (True, False):
+            # config_file_default_path exists, self_managed_config_file_path doesn't
             if config_file_default_path.is_symlink():
-                action_taken = "relinking_to_new_target"
-                details = "Removed existing symlink, will create target and new symlink"
-                console.print(Panel(f"🔄 RELINKING | Updating symlink from {config_file_default_path} ➡️  {self_managed_config_file_path}", title="Relinking", expand=False))
+                action_taken = "relink2newSelfManagedPath"
+                details = "Removed existing symlink, will create self_managed_config_file_path and copy"
+                console.print(Panel(f"🔄 REMOVING SYMLINK | Removing symlink {config_file_default_path}, creating {self_managed_config_file_path}", title="Removing Symlink", expand=False))
                 config_file_default_path.delete(sure=True)
                 self_managed_config_file_path.parent.mkdir(parents=True, exist_ok=True)
                 self_managed_config_file_path.touch()
             else:
-                action_taken = "moving_to_target"
-                details = "Moved source to target location, will copy"
-                console.print(Panel(f"📁 MOVING | Moving {config_file_default_path} to {self_managed_config_file_path}, then copying", title="Moving", expand=False))
+                action_taken = "move2selfManagedPath"
+                details = "Moved config_file_default_path to self_managed_config_file_path location, will copy back"
+                console.print(Panel(f"📁 MOVING | Moving {config_file_default_path} to {self_managed_config_file_path}, then copying back", title="Moving", expand=False))
                 config_file_default_path.move(path=self_managed_config_file_path)
-    else:
-        if self_managed_config_file_path.exists():
+        case (False, True):
+            # config_file_default_path doesn't exist, self_managed_config_file_path does
             action_taken = "new_link"
-            details = "Copying existing target to source location"
-            console.print(Panel(f"🆕 NEW LINK | Copying {self_managed_config_file_path} to {config_file_default_path}", title="New Link", expand=False))
-        else:
-            action_taken = "new_link_and_target"
-            details = "Creating target file and copying to source"
-            console.print(Panel(f"🆕 NEW LINK & TARGET | Creating {self_managed_config_file_path} and copying to {config_file_default_path}", title="New Link & Target", expand=False))
+            details = "Copying existing self_managed_config_file_path to config_file_default_path location"
+            console.print(Panel(f"🆕 NEW COPY | Copying {self_managed_config_file_path} to {config_file_default_path}", title="New Copy", expand=False))
+        case (False, False):
+            # Neither exists
+            action_taken = "newLinkAndSelfManagedPath"
+            details = "Creating self_managed_config_file_path file and copying to config_file_default_path"
+            console.print(Panel(f"🆕 NEW FILE & COPY | Creating {self_managed_config_file_path} and copying to {config_file_default_path}", title="New File & Copy", expand=False))
             self_managed_config_file_path.parent.mkdir(parents=True, exist_ok=True)
             self_managed_config_file_path.touch()
     
     try:
-        action_taken = action_taken or "copying"
-        details = details or "Copying file"
-        console.print(Panel(f"📋 COPYING | Copying {self_managed_config_file_path} to {config_file_default_path}", title="Copying", expand=False))
+        if not action_taken:
+            action_taken = "copying"
+            details = "Copying file"
+            console.print(Panel(f"📋 COPYING | Copying {self_managed_config_file_path} to {config_file_default_path}", title="Copying", expand=False))
         self_managed_config_file_path.copy(path=config_file_default_path, overwrite=True, verbose=True)
         return {"action": action_taken, "details": details}
     except Exception as ex:
@@ -300,3 +334,5 @@ def copy_map(config_file_default_path: PathExtended, self_managed_config_file_pa
         details = f"Failed to copy file: {str(ex)}"
         console.print(Panel(f"❌ ERROR | Failed at copying {self_managed_config_file_path} to {config_file_default_path}. Reason: {ex}", title="Error", expand=False))
         return {"action": action_taken, "details": details}
+
+

{machineconfig-5.18.dist-info → machineconfig-5.20.dist-info}/METADATA

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

{machineconfig-5.18.dist-info → machineconfig-5.20.dist-info}/RECORD

@@ -90,7 +90,7 @@ machineconfig/jobs/windows/archive/openssh-server_copy-ssh-id.ps1,sha256=-7pElYi
 machineconfig/jobs/windows/msc/cli_agents.bat,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/jobs/windows/msc/cli_agents.ps1,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/profile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/profile/create.py,sha256=sV97Zl6Pag1CkOjaQS8OpCcBrbR87KQz6c_bYP7fiOY,12066
+machineconfig/profile/create.py,sha256=n8AEpwWrGmzyWyIcFxTXQp8Ztw6MTHTjt1aPlsw7yhc,13974
 machineconfig/profile/create_frontend.py,sha256=RlrQgsAzvJA3KQInPpavLJ6XIEayIjjq4it6dSLQR08,3352
 machineconfig/profile/shell.py,sha256=B2dg2eV9fPMlMLlqjL3W91E0ZrEEg5qpJXmBax-Kx_M,10958
 machineconfig/profile/records/generic/shares.toml,sha256=FduDztfyQtZcr5bfx-RSKhEEweweQSWfVXkKWnx8hCY,143
@@ -146,7 +146,7 @@ machineconfig/scripts/python/cloud_sync.py,sha256=RWGpAfJ9fnN18yNBSgN44dzA38Hmd4
 machineconfig/scripts/python/count_lines.py,sha256=ZexMRsV70pe9fhLbGuens9EP5gCf078EwTDRHRZo5A0,15960
 machineconfig/scripts/python/count_lines_frontend.py,sha256=HlzPLU9_oJYqPNbnoQ0Hm4CuYy1UUlkZPcE5tFBSEbo,545
 machineconfig/scripts/python/croshell.py,sha256=zHUhOqWG81AOTeawZoDkpURnV1fAisY2lyZ0apvlmVY,6547
-machineconfig/scripts/python/devops.py,sha256=3EjUUOglL2DWYM1IuZJ6Eusn_FGyTa4GVDx8FKNCDcI,4407
+machineconfig/scripts/python/devops.py,sha256=GeHPeRvQGajtgWZZ4U1itF4bPh0tFTQ49YYg7iPnLCk,6767
 machineconfig/scripts/python/devops_add_identity.py,sha256=wvjNgqsLmqD2SxbNCW_usqfp0LI-TDvcJJKGOWt2oFw,3775
 machineconfig/scripts/python/devops_add_ssh_key.py,sha256=BXB-9RvuSZO0YTbnM2azeABW2ngLW4SKhhAGAieMzfw,6873
 machineconfig/scripts/python/devops_backup_retrieve.py,sha256=JLJHmi8JmZ_qVTeMW-qBEAYGt1fmfWXzZ7Gm-Q-GDcU,5585
@@ -163,13 +163,13 @@ machineconfig/scripts/python/fire_jobs_streamlit_helper.py,sha256=47DEQpj8HBSa-_
 machineconfig/scripts/python/ftpx.py,sha256=QfQTp-6jQP6yxfbLc5sKxiMtTgAgc8sjN7d17_uLiZc,9400
 machineconfig/scripts/python/get_zellij_cmd.py,sha256=e35-18hoXM9N3PFbvbizfkNY_-63iMicieWE3TbGcCQ,576
 machineconfig/scripts/python/gh_models.py,sha256=3BLfW25mBRiPO5VKtVm-nMlKLv-PaZDw7mObajq6F6M,5538
-machineconfig/scripts/python/interactive.py,sha256=d4zI-3pvT66y9sJEgH3qXPt3BTh12Mr91bJFhjVv_CA,10125
+machineconfig/scripts/python/interactive.py,sha256=FYb-bhn5GYDSER_l_w8YS_LwEI1aeczp3pF-3U2e3aQ,10038
 machineconfig/scripts/python/mount_nfs.py,sha256=aECrL64j9g-9rF49sVJAjGmzaoGgcMnl3g9v17kQF4c,3239
 machineconfig/scripts/python/mount_nw_drive.py,sha256=iru6AtnTyvyuk6WxlK5R4lDkuliVpPV5_uBTVVhXtjQ,1550
 machineconfig/scripts/python/mount_ssh.py,sha256=k2fKq3f5dKq_7anrFOlqvJoI_3U4EWNHLRZ1o3Lsy6M,2268
 machineconfig/scripts/python/onetimeshare.py,sha256=bmGsNnskym5OWfIhpOfZG5jq3m89FS0a6dF5Sb8LaZM,2539
 machineconfig/scripts/python/pomodoro.py,sha256=SPkfeoZGv8rylGiOyzQ7UK3aXZ3G2FIOuGkSuBUggOI,2019
-machineconfig/scripts/python/repos.py,sha256=IidAfUx6jFs4dB8Wjq8ems8mS8X8jYFgvEhtCYdLs-A,4917
+machineconfig/scripts/python/repos.py,sha256=7OwnQVedmLVgDnIY-OJ9epa1AcmRoUptu8ihyRNe_u4,5105
 machineconfig/scripts/python/repos_helper.py,sha256=3jLdnNf1canpzi3JXiz5VA6UTUmLeNHuhjOWVl_thP0,3006
 machineconfig/scripts/python/repos_helper_action.py,sha256=sXeOw5uHaK2GJixYW8qU_PD24mruGcQ59uf68ELC76A,14846
 machineconfig/scripts/python/repos_helper_clone.py,sha256=9vGb9NCXT0lkerPzOJjmFfhU8LSzE-_1LDvjkhgnal0,5461
@@ -387,7 +387,7 @@ machineconfig/utils/accessories.py,sha256=W_9dLzjwNTW5JQk_pe3B2ijQ1nA2-8Kdg2r7VB
 machineconfig/utils/code.py,sha256=CaDMxAoOKkjeMCr0Zw-yH0ghfz-4yvf3q7dPHKvHzrg,5634
 machineconfig/utils/installer.py,sha256=FitnRR2xOekkAygXgptKWdHHGdbXImKR8PcbgPmiPXw,10738
 machineconfig/utils/io.py,sha256=ZXB3aataS1IZ_0WMcCRSmoN1nbkvEO-bWYcs-TpngqU,2872
-machineconfig/utils/links.py,sha256=pbMlxElovS6aMfjYx2pd8MAHjQtFuD13-RPTJYbh5xI,20067
+machineconfig/utils/links.py,sha256=GQExBsMoxewOhwIrNdERuzk9HVKcmWgNUGO-RzPMS6M,22588
 machineconfig/utils/notifications.py,sha256=vvdsY5IX6XEiILTnt5lNyHxhCi0ljdGX2T_67VRfrG4,9009
 machineconfig/utils/options.py,sha256=vUO4Kej-vDOv64wHr2HNDyu6PATURpjd7xp6N8OOoJg,7083
 machineconfig/utils/path_extended.py,sha256=Xjdn2AVnB8p1jfNMNe2kJutVa5zGnFFJVGZbw-Bp_hg,53200
@@ -417,8 +417,8 @@ machineconfig/utils/schemas/fire_agents/fire_agents_input.py,sha256=pTxvLzIpD5RF
 machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoSpdmTIdgS9LS-RvE-QZ-D260tD3o,1214
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
-machineconfig-5.18.dist-info/METADATA,sha256=RRQwB-lj3IAjGHQM3sjVT1R8YoHzF0mbXglHpUb3Mjc,8030
-machineconfig-5.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-5.18.dist-info/entry_points.txt,sha256=2afE1mw-o4MUlfxyX73SV02XaQI4SV_LdL2r6_CzhPU,1074
-machineconfig-5.18.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-5.18.dist-info/RECORD,,
+machineconfig-5.20.dist-info/METADATA,sha256=1nL_AlCqeKOVeHhyQXWYzCUg6dXrutMRVaYqL6bbE2I,8030
+machineconfig-5.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-5.20.dist-info/entry_points.txt,sha256=2afE1mw-o4MUlfxyX73SV02XaQI4SV_LdL2r6_CzhPU,1074
+machineconfig-5.20.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-5.20.dist-info/RECORD,,