machineconfig 6.94__tar.gz → 6.96__tar.gz

{machineconfig-6.94/src/machineconfig.egg-info → machineconfig-6.96}/PKG-INFO

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

{machineconfig-6.94 → machineconfig-6.96}/pyproject.toml

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

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.94")
+        uv_with.append("machineconfig>=6.96")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -48,9 +48,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>=6.94" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.96" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.94" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.96" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -75,7 +75,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>=6.94,textual" """
+    else: executable = """--with "machineconfig>=6.96,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/scripts/python/helpers_devops/cli_share_server.py

@@ -114,14 +114,14 @@ def share_file_send(path: Annotated[str, typer.Argument(help="Path to the file o
     s.close()
     relay_port = "443"
     is_windows = platform.system() == "Windows"
-    
+
     # Build command parts
     relay_arg = f"--relay {local_ip_v4}:{relay_port} --ip {local_ip_v4}:{relay_port}"
     zip_arg = "--zip" if zip_folder else ""
     text_arg = f"--text '{text}'" if text else ""
     qrcode_arg = "--qrcode" if qrcode else ""
     path_arg = f"{path}" if not text else ""
-    
+
     if is_windows:
         # Windows PowerShell format
         code_arg = f"--code {code}" if code else ""
@@ -135,8 +135,9 @@ croc {relay_arg} send {zip_arg} {qrcode_arg} {text_arg} {path_arg}"""
             script = f"""croc {relay_arg} send {zip_arg} {qrcode_arg} {text_arg} {path_arg}"""
     
     typer.echo(f"🚀 Sending file: {path}. Use: devops network receive")
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(script=script, display_script=True, clean_env=False)
+    from machineconfig.utils.code import exit_then_run_shell_script, print_code
+    print_code(code=script, desc="🚀 sending file with croc", lexer="bash" if platform.system() != "Windows" else "powershell")
+    exit_then_run_shell_script(script=script, strict=False)
 
 
 def share_file_receive(code_args: Annotated[list[str], typer.Argument(help="Receive code or full relay command. Examples: '7121-donor-olympic-bicycle' or '--relay 10.17.62.206:443 0782-paris-pencil-torso'")],) -> None:
@@ -149,37 +150,26 @@ Usage examples:
     from machineconfig.utils.installer_utils.installer import install_if_missing
     install_if_missing(which="croc")
     import platform
-    import re
     
     is_windows = platform.system() == "Windows"
     
-    # Join all arguments back into a single string
-    code = " ".join(code_args)
+    # Join all arguments back into a single string and split into tokens
+    tokens = " ".join(code_args).split()
     
-    # Parse input to extract components
-    secret_code: str | None = None
+    # Parse input: either [code] or [--relay, server:port, code]
     relay_server: str | None = None
+    secret_code: str | None = None
     
-    # Check if it's Linux/macOS format with CROC_SECRET
-    linux_match = re.match(r'CROC_SECRET\s*=\s*["\']?([^"\']+)["\']?\s+croc\s+--relay\s+(\S+)(?:\s+--yes)?', code)
-    if linux_match:
-        secret_code = linux_match.group(1)
-        relay_server = linux_match.group(2)
+    if len(tokens) == 1:
+        # Just the code
+        secret_code = tokens[0]
+    elif len(tokens) >= 3 and tokens[0] == "--relay":
+        # Format: --relay server:port code [...]
+        relay_server = tokens[1]
+        secret_code = tokens[2]
     else:
-        # Check if it's Windows format or partial command
-        windows_match = re.match(r'(?:croc\s+)?(?:--relay\s+(\S+)\s+)?([a-z0-9-]+(?:-[a-z0-9-]+){3})(?:\s+--yes)?', code, re.IGNORECASE)
-        if windows_match:
-            relay_server = windows_match.group(1)
-            secret_code = windows_match.group(2)
-        else:
-            # Fallback: treat entire code as secret if it looks like a code
-            code_pattern = r'^[a-z0-9-]+(?:-[a-z0-9-]+){3}$'
-            if re.match(code_pattern, code.strip(), re.IGNORECASE):
-                secret_code = code.strip()
-    
-    if not secret_code:
-        raise ValueError(f"Could not parse croc code from input: {code}")
-    
+        raise ValueError(f"Could not parse croc code from input: {' '.join(code_args)}")
+        
     # Build the appropriate script for current OS
     if is_windows:
         # Windows PowerShell format: croc --relay server:port secret-code --yes
@@ -191,8 +181,9 @@ Usage examples:
         script = f"""export CROC_SECRET="{secret_code}"
 croc {relay_arg} --yes"""
     
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(script=script, display_script=True, clean_env=False)
+    from machineconfig.utils.code import exit_then_run_shell_script, print_code
+    print_code(code=script, desc="🚀 Receiving file with croc", lexer="bash" if platform.system() != "Windows" else "powershell")
+    exit_then_run_shell_script(script=script, strict=False)
 
 
 def get_share_file_app():

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.94"]
+        uv_with = ["machineconfig>=6.96"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.94" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.96" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.94" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.96" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,7 +2,7 @@
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 function mcfg {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.94" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.96" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/utils/code.py

@@ -112,17 +112,24 @@ def exit_then_run_shell_script(script: str, strict: bool = False):
     import os
     op_program_path = os.environ.get("OP_PROGRAM_PATH", None)
     if strict and op_program_path is None:
-        op_program_path = Path.home().joinpath("tmp_results", "tmp_scripts", "manual_run", f"manual_script_{randstr()}.ps1")
+        import platform
+        if platform.system() == "Windows":
+            suffix = ".ps1"
+            lexer = "powershell"
+        else:
+            suffix = ".sh"
+            lexer = "bash"
+        op_program_path = Path.home().joinpath("tmp_results", "tmp_scripts", "manual_run", f"manual_script_{randstr()}.{suffix}")
         op_program_path.parent.mkdir(parents=True, exist_ok=True)
         op_program_path.write_text(script, encoding="utf-8")
-        print_code(script, lexer="powershell", desc="script to run manually")
-        print(f"Please run the script manually via your PowerShell by executing the script @:\n{str(op_program_path)}")
+        print_code(script, lexer=lexer, desc="script to run manually")
+        print(f"Please run the script manually via your shell by executing the script @:\n{str(op_program_path)}")
         print("OP_PROGRAM_PATH environment variable is not set in strict mode.")
     if op_program_path is not None:
         op_program_path = Path(op_program_path)
         op_program_path.parent.mkdir(parents=True, exist_ok=True)
         op_program_path.write_text(script, encoding="utf-8")
-        print(f"Handing over to powershell script runner via OP_PROGRAM_PATH @\n{str(op_program_path)}...")
+        print(f"Handing over to shell script runner via OP_PROGRAM_PATH @\n{str(op_program_path)}...")
     else:
         run_shell_script(script)
     import sys

{machineconfig-6.94 → machineconfig-6.96}/src/machineconfig/utils/ssh.py

@@ -8,7 +8,7 @@ from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=6.94"
+MACHINECONFIG_VERSION = "machineconfig>=6.96"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-6.94 → machineconfig-6.96/src/machineconfig.egg-info}/PKG-INFO

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