appostle-installer 0.1.42 → 0.1.43

package/dist/appostle-installer.js

@@ -9960,14 +9960,30 @@ async function runInteractive(command, args = [], options = {}) {
   await execa(command, args, { stdio: "inherit", ...options });
 }
 var cachedNeedsSudo = null;
+var cachedGlobalPrefix;
+async function npmGlobalPrefix() {
+  if (cachedGlobalPrefix !== void 0) return cachedGlobalPrefix;
+  try {
+    const { stdout } = await execa("npm", ["prefix", "-g"]);
+    const prefix = stdout.trim();
+    return cachedGlobalPrefix = prefix || null;
+  } catch {
+    return cachedGlobalPrefix = null;
+  }
+}
+async function npmGlobalBinDir() {
+  const prefix = await npmGlobalPrefix();
+  if (!prefix) return null;
+  if (currentPlatform() === "win32") return prefix;
+  return `${prefix}/bin`;
+}
 async function npmGlobalNeedsSudo() {
   if (cachedNeedsSudo !== null) return cachedNeedsSudo;
   if (currentPlatform() === "win32") return cachedNeedsSudo = false;
   if (process.getuid?.() === 0) return cachedNeedsSudo = false;
+  const prefix = await npmGlobalPrefix();
+  if (!prefix) return cachedNeedsSudo = false;
   try {
-    const { stdout } = await execa("npm", ["prefix", "-g"]);
-    const prefix = stdout.trim();
-    if (!prefix) return cachedNeedsSudo = false;
     accessSync(prefix, constants4.W_OK);
     return cachedNeedsSudo = false;
   } catch {
@@ -9976,7 +9992,8 @@ async function npmGlobalNeedsSudo() {
 }
 async function npmInstallGlobal(packages) {
   const useSudo = await npmGlobalNeedsSudo();
-  const args = ["install", "-g", ...packages];
+  const prefix = await npmGlobalPrefix();
+  const args = ["install", "-g", ...prefix ? ["--prefix", prefix] : [], ...packages];
   if (useSudo) {
     await runInteractive("sudo", ["-E", "npm", ...args]);
   } else {
@@ -9994,6 +10011,14 @@ function resolvePackagedAppostleBin() {
   }
   return null;
 }
+var LAUNCHD_BASE_PATH = "/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin";
+var SYSTEMD_BASE_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
+function composeDaemonPath(npmBin, basePath) {
+  if (!npmBin) return basePath;
+  const parts = basePath.split(":").filter(Boolean);
+  if (parts.includes(npmBin)) return basePath;
+  return [npmBin, ...parts].join(":");
+}
 async function installAppostleGlobal() {
   await npmInstallGlobal([`${INSTALLER_PACKAGE}@latest`]);
 }
@@ -10110,6 +10135,7 @@ async function installLaunchd() {
   const plistPath = path6.join(osHome, "Library", "LaunchAgents", "agency.ohlord.appostle.plist");
   const logPath = path6.join(osHome, "Library", "Logs", "appostle.log");
   const appostleBin = resolvePackagedAppostleBin() ?? await resolveBinary("appostle") ?? "/usr/local/bin/appostle";
+  const daemonPath = composeDaemonPath(await npmGlobalBinDir(), LAUNCHD_BASE_PATH);
   const plist = `<?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">
 <plist version="1.0">
@@ -10128,7 +10154,7 @@ async function installLaunchd() {
   <key>StandardErrorPath</key><string>${logPath}</string>
   <key>EnvironmentVariables</key>
   <dict>
-    <key>PATH</key><string>/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin</string>
+    <key>PATH</key><string>${daemonPath}</string>
     <key>HOME</key><string>${osHome}</string>
     <key>NODE_ENV</key><string>production</string>
     <key>APPOSTLE_RELAY_ENDPOINT</key><string>${APPOSTLE_RELAY_ENDPOINT}</string>
@@ -10271,6 +10297,7 @@ async function installSystemdSystem() {
   const unitPath = "/etc/systemd/system/appostle.service";
   const appostleBin = resolvePackagedAppostleBin() ?? await resolveBinary("appostle") ?? "/usr/bin/appostle";
   const logPath = path6.join(osHome, ".local", "state", "appostle", "daemon.log");
+  const daemonPath = composeDaemonPath(await npmGlobalBinDir(), SYSTEMD_BASE_PATH);
   const unit = `[Unit]
 Description=Appostle Daemon
 After=network.target
@@ -10283,6 +10310,7 @@ Restart=always
 RestartSec=2
 Environment=NODE_ENV=production
 Environment=HOME=${osHome}
+Environment=PATH=${daemonPath}
 Environment=APPOSTLE_RELAY_ENDPOINT=${APPOSTLE_RELAY_ENDPOINT}
 StandardOutput=append:${logPath}
 StandardError=append:${logPath}