machineconfig 5.56__tar.gz → 5.58__tar.gz

{machineconfig-5.56/src/machineconfig.egg-info → machineconfig-5.58}/PKG-INFO

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

{machineconfig-5.56 → machineconfig-5.58}/pyproject.toml

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

{machineconfig-5.56 → machineconfig-5.58}/src/machineconfig/jobs/installer/linux_scripts/q.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+mkdir -p $HOME/Downloads || true
 cd $HOME/Downloads
 curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o "q.zip"
 unzip q.zip

{machineconfig-5.56 → machineconfig-5.58}/src/machineconfig/utils/code.py

@@ -113,9 +113,7 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     if display_script:
         from rich.syntax import Syntax
         console.print(Panel(Syntax(code=script, lexer=lexer), title=f"📄 shell script @ {temp_script_path}", subtitle="shell script being executed"), style="bold red")
-
     env = {} if clean_env else None
-
     if platform.system() == "Windows":
         import subprocess
         proc = subprocess.run(f'powershell -ExecutionPolicy Bypass -File "{temp_script_path}"', check=True, shell=True, env=env)
@@ -133,6 +131,7 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
         console.print(f"⚠️  [yellow]Script executed with warnings (return code {proc.returncode}):[/yellow] [blue]{temp_script_path}[/blue]")    
     temp_script_path.unlink(missing_ok=True)
     console.print(f"🗑️  [blue]Temporary script deleted:[/blue] [green]{temp_script_path}[/green]")
+    return proc
 
 
 # def run_command(command: str, description: str) -> bool:

{machineconfig-5.56 → machineconfig-5.58}/src/machineconfig/utils/installer_utils/installer_class.py

@@ -39,9 +39,7 @@ class Installer:
             result_old = subprocess.run(f"{exe_name} --version", shell=True, capture_output=True, text=True)
             old_version_cli = result_old.stdout.strip()
             print(f"📊 Current version: {old_version_cli or 'Not installed'}")
-
             self.install(version=version)
-
             result_new = subprocess.run(f"{exe_name} --version", shell=True, capture_output=True, text=True)
             new_version_cli = result_new.stdout.strip()
             print(f"📊 New version: {new_version_cli}")
@@ -77,8 +75,10 @@ class Installer:
                 desc = package_manager + " installation"
                 version_to_be_installed = package_manager + "Latest"
                 print(f"🚀 Running: {installer_arch_os}")
-                result = subprocess.run(installer_arch_os, shell=True, capture_output=True, text=True)
-                success = result.returncode == 0 and result.stderr == ""
+                # result = subprocess.run(installer_arch_os, shell=True, capture_output=True, text=True)
+                from machineconfig.utils.code import run_shell_script
+                result = run_shell_script(installer_arch_os)
+                success = result.returncode == 0 and result.stderr == "".encode()
                 if not success:
                     print(f"❌ {desc} failed")
                     if result.stdout:

{machineconfig-5.56 → machineconfig-5.58/src/machineconfig.egg-info}/PKG-INFO

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