primitive 0.2.16__py3-none-any.whl → 0.2.18__py3-none-any.whl

primitive/__about__.py

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

primitive/daemons/actions.py

@@ -1,5 +1,4 @@
 import platform
-import subprocess
 import typing
 from pathlib import Path
 from typing import Dict, List, Optional
@@ -19,35 +18,27 @@ class Daemons:
         self.primitive: Primitive = primitive
         self.os_family = platform.system()
 
-        result = subprocess.run(["which", "primitive"], capture_output=True)
-        if result.returncode == 0:
-            found_primitive_binary_path = result.stdout.decode().rstrip("\n")
-        else:
-            raise Exception("primitive binary not found")
-
         match self.os_family:
             case "Darwin":
                 self.daemons: Dict[str, Daemon] = {
                     "agent": LaunchAgent(
-                        "tech.primitive.agent",
-                        executable=str(found_primitive_binary_path),
+                        label="tech.primitive.agent",
                         command="--debug agent",
                     ),
                     "monitor": LaunchAgent(
-                        "tech.primitive.monitor",
-                        executable=str(found_primitive_binary_path),
+                        label="tech.primitive.monitor",
                         command="--debug monitor",
                     ),
                 }
             case "Linux":
                 self.daemons: Dict[str, Daemon] = {
                     "agent": LaunchService(
-                        "tech.primitive.agent",
-                        command=f'/bin/sh -lc "{found_primitive_binary_path} --debug agent"',
+                        label="tech.primitive.agent",
+                        command="--debug agent",
                     ),
                     "monitor": LaunchService(
-                        "tech.primitive.monitor",
-                        command=f'/bin/sh -lc "{found_primitive_binary_path} --debug monitor"',
+                        label="tech.primitive.monitor",
+                        command="--debug monitor",
                     ),
                 }
             case _:

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">
@@ -181,8 +188,8 @@ class LaunchAgent(Daemon):
             [
                 self.stop(),
                 self.unload(),
-                self.populate(),
                 self.create_stdout_file(),
+                self.populate(),
                 self.load(),
                 self.start(load=False),
             ]

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}",
@@ -186,8 +194,8 @@ class LaunchService(Daemon):
             [
                 self.stop(),
                 self.disable(),
-                self.populate(),
                 self.create_stdout_file(),
+                self.populate(),
                 self.enable(),
                 self.start(),
             ]

{primitive-0.2.16.dist-info → primitive-0.2.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: primitive
-Version: 0.2.16
+Version: 0.2.18
 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.16.dist-info → primitive-0.2.18.dist-info}/RECORD

@@ -1,4 +1,4 @@
-primitive/__about__.py,sha256=HrQQaOWuqVOmGCuXjJQ4OHW4-hRY9aXKjk3BQ63-Bw4,130
+primitive/__about__.py,sha256=RIxrlKbwmawRHlio3BHfw8GueREygRiKu6jye9nolFM,130
 primitive/__init__.py,sha256=bwKdgggKNVssJFVPfKSxqFMz4IxSr54WWbmiZqTMPNI,106
 primitive/cli.py,sha256=g7EtHI9MATAB0qQu5w-WzbXtxz_8zu8z5E7sETmMkKU,2509
 primitive/client.py,sha256=h8WZVnQylVe0vbpuyC8YZHl2JyITSPC-1HbUcmrE5pc,3623
@@ -13,10 +13,10 @@ primitive/auth/commands.py,sha256=2z5u5xX64n0yILucx9emtWh3uQXLvs2QQQQIldZGr94,23
 primitive/auth/graphql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 primitive/auth/graphql/queries.py,sha256=jhrr_VFzHIn8vcVprMIzUx7V4kkWYdR6CKMKPoVFv60,180
 primitive/daemons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-primitive/daemons/actions.py,sha256=a5DP60day_l19bIx-ThRsN4V7zHPFwqcMYnhnVrplCU,2975
+primitive/daemons/actions.py,sha256=vIkXV8azocHoSMGMJvEvXZztf7x7AU9ePe16cvLgC4s,2490
 primitive/daemons/commands.py,sha256=Xt4qFymNrDLdHJhRnEH_4Re-2xX6w1OT-chV9k7dFCs,2670
-primitive/daemons/launch_agents.py,sha256=VQ-c9PVTOr3JVt2jfLxIPDS1glKyBM2oDAzSUsFP9_A,7455
-primitive/daemons/launch_service.py,sha256=JA2kj1obCzu9sGmLFUMdEVKI-aj018b_tZBor0wVJSQ,7531
+primitive/daemons/launch_agents.py,sha256=5MFDacs_IZd6PCm4VRNq9dPEYIDivkydBzqex1ggkFY,7740
+primitive/daemons/launch_service.py,sha256=iuklHeuEqadlf8U1n9xFg4ZG1EKdK2jyaPI-VTlpJ4I,7907
 primitive/daemons/ui.py,sha256=Af3OJWJ0jdGlb1nfA5yaGYdhBEqqpM8zP2U2vUQdCbw,1236
 primitive/db/base.py,sha256=mH7f2d_jiyxJSSx9Gk53QBXRa3LiKBsBjkFgvmtH1WA,83
 primitive/db/models.py,sha256=GfnJdAq4Tb68CI4BKAuJDZVqioGavveaAHbCPeLNngw,2840
@@ -96,8 +96,8 @@ primitive/utils/memory_size.py,sha256=4xfha21kW82nFvOTtDFx9Jk2ZQoEhkfXii-PGNTpIU
 primitive/utils/printer.py,sha256=f1XUpqi5dkTL3GWvYRUGlSwtj2IxU1q745T4Fxo7Tn4,370
 primitive/utils/shell.py,sha256=jWzb7ky7p987dJas6ZvarK3IJNZ5cwBXcryRWb9Uh6U,2072
 primitive/utils/text.py,sha256=XiESMnlhjQ534xE2hMNf08WehE1SKaYFRNih0MmnK0k,829
-primitive-0.2.16.dist-info/METADATA,sha256=YIJsHdl6uWQvkyzjA3T02ECntyeUxPHjdeichj6JvGk,3733
-primitive-0.2.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-primitive-0.2.16.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
-primitive-0.2.16.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
-primitive-0.2.16.dist-info/RECORD,,
+primitive-0.2.18.dist-info/METADATA,sha256=79Ptsf54EjO4GapJQH4XywOWzrWtcfAgpAHkYXGh39s,3733
+primitive-0.2.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+primitive-0.2.18.dist-info/entry_points.txt,sha256=p1K8DMCWka5FqLlqP1sPek5Uovy9jq8u51gUsP-z334,48
+primitive-0.2.18.dist-info/licenses/LICENSE.txt,sha256=B8kmQMJ2sxYygjCLBk770uacaMci4mPSoJJ8WoDBY_c,1098
+primitive-0.2.18.dist-info/RECORD,,