@atlashub/smartstack-cli 4.63.0 → 4.64.0

package/dist/index.js

@@ -127451,6 +127451,23 @@ function getInstallCmd(pm, info) {
   if (!pm) return void 0;
   return info[pm];
 }
+function resolvePodmanCmd() {
+  try {
+    (0, import_child_process8.execSync)("podman --version", { encoding: "utf-8", timeout: 5e3, stdio: "pipe" });
+    return "podman";
+  } catch {
+  }
+  if (process.platform === "win32") {
+    const knownPaths = [
+      "C:\\Program Files\\RedHat\\Podman\\podman.exe",
+      (0, import_path13.join)(process.env.LOCALAPPDATA || "", "RedHat", "Podman", "podman.exe")
+    ];
+    for (const p of knownPaths) {
+      if (require("fs").existsSync(p)) return `"${p}"`;
+    }
+  }
+  return "podman";
+}
 function getContainerEngineStatus() {
   try {
     const dockerVer = (0, import_child_process8.execSync)("docker --version", { encoding: "utf-8", timeout: 5e3, stdio: "pipe" }).trim();
@@ -127466,7 +127483,8 @@ function getContainerEngineStatus() {
   } catch {
   }
   try {
-    const podmanVer = (0, import_child_process8.execSync)("podman --version", { encoding: "utf-8", timeout: 5e3, stdio: "pipe" }).trim();
+    const podmanCmd = resolvePodmanCmd();
+    const podmanVer = (0, import_child_process8.execSync)(`${podmanCmd} --version`, { encoding: "utf-8", timeout: 5e3, stdio: "pipe" }).trim();
     return { name: "Podman", version: podmanVer.replace("podman version ", ""), running: true };
   } catch {
   }
@@ -127679,7 +127697,8 @@ var doctorCommand = new Command("doctor").description("Run diagnostics and check
         status: server.installed ? "ok" : "error",
         message: server.installed ? "Available" : "Not installed",
         details: server.description,
-        fix: !server.installed ? server.installCommand : void 0
+        fix: !server.installed ? server.installCommand : void 0,
+        installCmd: !server.installed ? server.installCommand : void 0
       });
     }
   } else {
@@ -127826,8 +127845,17 @@ ${source_default.gray(item.details)}`;
           (0, import_child_process8.execSync)(item.installCmd, { encoding: "utf-8", stdio: "inherit", timeout: 3e5 });
           console.log(`  ${source_default.green("\u2713")} ${item.name} installed`);
           fixed++;
-        } catch {
-          console.log(`  ${source_default.red("\u2717")} ${item.name} install failed \u2014 try manually: ${source_default.cyan(item.installCmd)}`);
+        } catch (err) {
+          const stderr = err.stderr || "";
+          const stdout = err.stdout || "";
+          const output = stderr + stdout;
+          const alreadyInstalled = /already installed|déjà.*install|no applicable update|introuvable/i.test(output);
+          if (alreadyInstalled) {
+            console.log(`  ${source_default.green("\u2713")} ${item.name} already installed (restart terminal if not detected)`);
+            fixed++;
+          } else {
+            console.log(`  ${source_default.red("\u2717")} ${item.name} install failed \u2014 try manually: ${source_default.cyan(item.installCmd)}`);
+          }
         }
         console.log();
       }
@@ -130101,29 +130129,63 @@ tmuxCommand.command("status").description("Show WSL development environment stat
 var import_child_process12 = require("child_process");
 var import_path18 = require("path");
 var import_fs_extra16 = __toESM(require_lib());
+function resolveEngineCmd(name) {
+  try {
+    const result = (0, import_child_process12.spawnSync)(name, ["--version"], {
+      encoding: "utf-8",
+      shell: true,
+      timeout: 5e3,
+      stdio: "pipe"
+    });
+    if (result.status === 0) return name;
+  } catch {
+  }
+  if (process.platform === "win32" && name === "podman") {
+    const knownPaths = [
+      "C:\\Program Files\\RedHat\\Podman\\podman.exe",
+      (0, import_path18.join)(process.env.LOCALAPPDATA || "", "RedHat", "Podman", "podman.exe")
+    ];
+    for (const p of knownPaths) {
+      if (import_fs_extra16.default.existsSync(p)) {
+        try {
+          const result = (0, import_child_process12.spawnSync)(`"${p}"`, ["--version"], {
+            encoding: "utf-8",
+            shell: true,
+            timeout: 5e3,
+            stdio: "pipe"
+          });
+          if (result.status === 0) return `"${p}"`;
+        } catch {
+        }
+      }
+    }
+  }
+  return name;
+}
 function checkEngine(name) {
+  const cmd = resolveEngineCmd(name);
   try {
-    const version2 = (0, import_child_process12.spawnSync)(name, ["--version"], {
+    const version2 = (0, import_child_process12.spawnSync)(cmd, ["--version"], {
       encoding: "utf-8",
       shell: true,
       timeout: 5e3,
       stdio: "pipe"
     });
     if (version2.status !== 0) {
-      return { name, installed: false, running: false };
+      return { name, installed: false, running: false, cmd };
     }
     if (name === "podman") {
-      return { name, installed: true, running: true };
+      return { name, installed: true, running: true, cmd };
     }
-    const info = (0, import_child_process12.spawnSync)(name, ["info"], {
+    const info = (0, import_child_process12.spawnSync)(cmd, ["info"], {
       encoding: "utf-8",
       shell: true,
       timeout: 1e4,
       stdio: "pipe"
     });
-    return { name, installed: true, running: info.status === 0 };
+    return { name, installed: true, running: info.status === 0, cmd };
   } catch {
-    return { name, installed: false, running: false };
+    return { name, installed: false, running: false, cmd };
   }
 }
 function detectEngine() {
@@ -130174,7 +130236,7 @@ function requireComposeFile() {
   return composePath;
 }
 function runCompose(engine, composePath, args) {
-  const result = (0, import_child_process12.spawnSync)(engine.name, ["compose", "-f", composePath, ...args], {
+  const result = (0, import_child_process12.spawnSync)(engine.cmd, ["compose", "-f", composePath, ...args], {
     encoding: "utf-8",
     shell: true,
     stdio: "inherit",