primitive 0.2.15__tar.gz → 0.2.17__tar.gz

{primitive-0.2.15 → primitive-0.2.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.15
+Version: 0.2.17
 Project-URL: Documentation, https://github.com//primitivecorp/primitive-cli#readme
 Project-URL: Issues, https://github.com//primitivecorp/primitive-cli/issues
 Project-URL: Source, https://github.com//primitivecorp/primitive-cli

{primitive-0.2.15 → primitive-0.2.17}/src/primitive/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Dylan Stein <dylan@primitive.tech>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.2.15"
+__version__ = "0.2.17"

{primitive-0.2.15 → primitive-0.2.17}/src/primitive/daemons/actions.py

@@ -1,5 +1,4 @@
 import platform
-import subprocess
 import typing
 from pathlib import Path
 from typing import Dict, List, Optional
@@ -12,7 +11,6 @@ from .launch_agents import LaunchAgent
 from .launch_service import LaunchService
 
 HOME_DIRECTORY = Path.home()
-PRIMITIVE_BINARY_PATH = Path(HOME_DIRECTORY / ".pyenv" / "shims" / "primitive")
 
 
 class Daemons:
@@ -20,27 +18,15 @@ class Daemons:
         self.primitive: Primitive = primitive
         self.os_family = platform.system()
 
-        found_primitive_binary_path = PRIMITIVE_BINARY_PATH
-        if not PRIMITIVE_BINARY_PATH.exists():
-            result = subprocess.run(["which", "primitive"], capture_output=True)
-            if result.returncode == 0:
-                found_primitive_binary_path = result.stdout.decode().rstrip("\n")
-            else:
-                raise Exception(
-                    f"primitive binary not found at {PRIMITIVE_BINARY_PATH}"
-                )
-
         match self.os_family:
             case "Darwin":
                 self.daemons: Dict[str, Daemon] = {
                     "agent": LaunchAgent(
                         "tech.primitive.agent",
-                        executable=str(found_primitive_binary_path),
                         command="--debug agent",
                     ),
                     "monitor": LaunchAgent(
                         "tech.primitive.monitor",
-                        executable=str(found_primitive_binary_path),
                         command="--debug monitor",
                     ),
                 }
@@ -48,11 +34,11 @@ class Daemons:
                 self.daemons: Dict[str, Daemon] = {
                     "agent": LaunchService(
                         "tech.primitive.agent",
-                        command=f'/bin/sh -lc "{found_primitive_binary_path} --debug agent"',
+                        command="--debug agent",
                     ),
                     "monitor": LaunchService(
                         "tech.primitive.monitor",
-                        command=f'/bin/sh -lc "{found_primitive_binary_path} --debug monitor"',
+                        command="--debug monitor",
                     ),
                 }
             case _:

{primitive-0.2.15 → primitive-0.2.17}/src/primitive/daemons/launch_agents.py

@@ -11,10 +11,9 @@ CURRENT_USER = str(HOME_DIRECTORY.expanduser()).lstrip("/Users/")
 
 
 class LaunchAgent(Daemon):
-    def __init__(self, label: str, executable: str, command: str):
+    def __init__(self, label: str, command: str):
         self.label = label
         self.name = label.split(".")[-1]
-        self.executable = executable
         self.command = command
 
     @property
@@ -106,6 +105,14 @@ class LaunchAgent(Daemon):
         self.file_path.parent.mkdir(parents=True, exist_ok=True)
         self.file_path.touch()
 
+        # this is here so that it won't break on primitive's init
+        # do not move
+        result = subprocess.run(["which", "primitive"], capture_output=True)
+        if result.returncode == 0:
+            self.executable = result.stdout.decode().rstrip("\n")
+        else:
+            raise Exception("primitive binary not found")
+
         self.file_path.write_text(
             f"""<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

{primitive-0.2.15 → primitive-0.2.17}/src/primitive/daemons/launch_service.py

@@ -121,8 +121,16 @@ class LaunchService(Daemon):
             "After": "network.target",
         }
 
+        # this is here so that it won't break on primitive's init
+        # do not move
+        result = subprocess.run(["which", "primitive"], capture_output=True)
+        if result.returncode == 0:
+            self.executable = result.stdout.decode().rstrip("\n")
+        else:
+            raise Exception("primitive binary not found")
+
         config["Service"] = {
-            "ExecStart": self.command,
+            "ExecStart": f'/bin/sh -lc "{self.executable} {self.command}"',
             "Restart": "always",
             "StandardError": f"append:{self.logs}",
             "StandardOutput": f"append:{self.logs}",