portacode 1.4.17.dev9__tar.gz → 1.4.17.dev10__tar.gz

{portacode-1.4.17.dev9 → portacode-1.4.17.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.17.dev9
+Version: 1.4.17.dev10
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.17.dev9 → portacode-1.4.17.dev10}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.17.dev9'
-__version_tuple__ = version_tuple = (1, 4, 17, 'dev9')
+__version__ = version = '1.4.17.dev10'
+__version_tuple__ = version_tuple = (1, 4, 17, 'dev10')
 
 __commit_id__ = commit_id = None

{portacode-1.4.17.dev9 → portacode-1.4.17.dev10}/portacode/service.py

@@ -209,6 +209,7 @@ class _OpenRCService:
 
     def __init__(self) -> None:
         self.init_path = Path("/etc/init.d") / self.NAME
+        self.wrapper_path = Path("/usr/local/share/portacode/connect_service.sh")
         self.user = os.environ.get("SUDO_USER") or os.environ.get("USER") or os.getlogin()
         try:
             self.home = Path(pwd.getpwnam(self.user).pw_dir)
@@ -224,18 +225,16 @@ class _OpenRCService:
         return subprocess.run(cmd, text=True, capture_output=True)
 
     def _write_init_script(self) -> None:
+        self._write_wrapper_script()
         script = textwrap.dedent(f"""
             #!/sbin/openrc-run
             description="Portacode persistent connection"
 
-            command="{self.python}"
-            command_args="-m portacode connect --non-interactive"
+            command="{self.wrapper_path}"
             command_user="{self.user}"
             command_background="yes"
             pidfile="/run/portacode.pid"
             directory="{self.home}"
-            output_log="{self.log_path}"
-            error_log="{self.log_path}"
 
             depend() {{
                 need net
@@ -243,6 +242,10 @@ class _OpenRCService:
 
             start_pre() {{
                 checkpath --directory --mode 0755 /var/log/portacode
+                checkpath --directory --mode 0755 /usr/local/share/portacode
+                touch "{self.log_path}"
+                chown {self.user} "{self.log_path}"
+                chown {self.user} /var/log/portacode
             }}
         """).lstrip()
 
@@ -258,6 +261,25 @@ class _OpenRCService:
             tmp_path.unlink()
         except Exception:
             pass
+    
+    def _write_wrapper_script(self) -> None:
+        script = textwrap.dedent(f"""
+            #!/bin/sh
+            cd "{self.home}"
+            exec "{self.python}" -m portacode connect --non-interactive >> "{self.log_path}" 2>&1
+        """).lstrip()
+        tmp_path = Path(tempfile.gettempdir()) / f"portacode-wrapper-{os.getpid()}"
+        tmp_path.write_text(script)
+        if os.geteuid() != 0:
+            self._run("install", "-m", "755", str(tmp_path), str(self.wrapper_path))
+        else:
+            self.wrapper_path.parent.mkdir(parents=True, exist_ok=True)
+            shutil.copyfile(tmp_path, self.wrapper_path)
+            self.wrapper_path.chmod(0o755)
+        try:
+            tmp_path.unlink()
+        except Exception:
+            pass
 
     def install(self) -> None:
         self._write_init_script()

{portacode-1.4.17.dev9 → portacode-1.4.17.dev10}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.17.dev9
+Version: 1.4.17.dev10
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian