machineconfig 5.43__tar.gz → 5.45__tar.gz

{machineconfig-5.43/src/machineconfig.egg-info → machineconfig-5.45}/PKG-INFO

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

{machineconfig-5.43 → machineconfig-5.45}/pyproject.toml

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

{machineconfig-5.43 → machineconfig-5.45}/src/machineconfig/profile/create_shell_profile.py

@@ -45,10 +45,10 @@ def create_default_shell_profile() -> None:
 
     if system == "Windows":
         init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/pwsh/init.ps1")
-        source_line = f""". {str(init_script.collapseuser()).replace("~", "$HOME")}"""
+        source_line = f""". {str(init_script.collapseuser(placeholder="$HOME"))}"""
     else:
         init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/bash/init.sh")
-        source_line = f"""source {str(init_script).replace("~", "$HOME")}"""
+        source_line = f"""source {str(init_script.collapseuser(placeholder="$HOME"))}"""
 
     was_shell_updated = False
     if source_line in shell_profile:

{machineconfig-5.43 → machineconfig-5.45}/src/machineconfig/scripts/python/devops_helpers/cli_config.py

@@ -49,3 +49,13 @@ def pwsh_theme():
     file = Path(themes.__file__).parent / "choose_pwsh_theme.ps1"
     import subprocess
     subprocess.run(["pwsh", "-File", str(file)])
+
+@config_apps.command(no_args_is_help=False)
+def copy_assets(which: Literal["scripts", "settings", "both"] = typer.Option(..., "--which", "-w", help="Which assets to copy")):
+    """🔗 Copy asset files from library to machine."""
+    import machineconfig.profile.create_helper as create_helper
+    if which == "both":
+        create_helper.copy_assets_to_machine(which="scripts")
+        create_helper.copy_assets_to_machine(which="settings")
+    else:
+        create_helper.copy_assets_to_machine(which=which)

{machineconfig-5.43 → machineconfig-5.45}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -21,18 +21,18 @@ def status():
     import machineconfig.scripts.python.devops_helpers.devops_status as helper
     helper.main()
 @cli_app.command()
-def clone():
+def install():
     """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
-    import platform
     from machineconfig.utils.code import run_shell_script
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
+    # from machineconfig.profile.create_links_export import main_public_from_parser
+    create_default_shell_profile()
+    # main_public_from_parser()
+    import platform
     if platform.system() == "Windows":
-        from machineconfig.setup_windows import MACHINECONFIG
-        create_default_shell_profile()
+        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig""")
     else:
-        from machineconfig.setup_linux import MACHINECONFIG
-        create_default_shell_profile()
-    run_shell_script(MACHINECONFIG.read_text(encoding="utf-8"))
+        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig""")
 
 @cli_app.command(no_args_is_help=False)
 def navigate():

{machineconfig-5.43 → machineconfig-5.45}/src/machineconfig/scripts/python/interactive.py

@@ -129,14 +129,14 @@ def execute_installations(selected_options: list[str]) -> None:
 
     if "install_repos" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
+        import platform
         if platform.system() == "Windows":
-            from machineconfig.setup_windows import MACHINECONFIG
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig""")
         else:
-            from machineconfig.setup_linux import MACHINECONFIG
-        run_shell_script(MACHINECONFIG.read_text(encoding="utf-8"))
-
+            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig""")
     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"))
+        import platform
         if platform.system() == "Windows":
             powershell_script = """Write-Host "🔧 Installing and configuring SSH server..."
 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0

{machineconfig-5.43 → machineconfig-5.45}/src/machineconfig/setup_linux/__init__.py

@@ -2,7 +2,6 @@
 from pathlib import Path
 
 APPS = Path(__file__).parent.joinpath("apps.sh")
-MACHINECONFIG = Path(__file__).parent.joinpath("machineconfig.sh")
 UV = Path(__file__).parent.joinpath("uv.sh")
 
 APPS_DESKTOP = Path(__file__).parent.joinpath("apps_desktop.sh")

{machineconfig-5.43 → machineconfig-5.45}/src/machineconfig/setup_windows/__init__.py

@@ -2,7 +2,6 @@
 from pathlib import Path
 
 APPS = Path(__file__).parent.joinpath("apps.ps1")
-MACHINECONFIG = Path(__file__).parent.joinpath("machineconfig.ps1")
 UV = Path(__file__).parent.joinpath("uv.ps1")
 
 DOCKER = Path(__file__).parent.joinpath("others/docker.ps1")

{machineconfig-5.43 → machineconfig-5.45/src/machineconfig.egg-info}/PKG-INFO

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