@kud/soap-cli 3.0.15 → 3.0.17

package/dist/index.js

@@ -196,9 +196,9 @@ var getComputerName = () => {
 };
 var getBundleIdentifier = async (appName) => {
   try {
-    const bundleId = execSync(
-      `osascript -e 'id of app "${appName}"'`
-    ).toString();
+    const bundleId = execSync(`osascript -e 'id of app "${appName}"'`, {
+      stdio: "pipe"
+    }).toString();
     return bundleId.trimEnd();
   } catch {
     throw new Error(
@@ -247,7 +247,7 @@ var param = rawArgs.find((a) => !a.startsWith("-"));
 var yes = rawArgs.includes("--yes") || rawArgs.includes("-y");
 var yesDangerously = rawArgs.includes("--yes-dangerously");
 if (firstArg === "--version" || firstArg === "-v") {
-  console.log("3.0.15");
+  console.log("3.0.17");
   process.exit(0);
 }
 if (!firstArg || firstArg === "--help" || firstArg === "-h") {
@@ -312,7 +312,7 @@ try {
       signale.warn(
         `Could not determine app name for "${param}", falling back to brew uninstall.`
       );
-      await $2`brew uninstall --zap ${param}`;
+      await $2({ quiet: true })`brew uninstall --zap ${param}`;
       process.exit(0);
     }
     signale.error(`Could not determine app name for "${param}".`);
@@ -426,7 +426,7 @@ Can you become an admin before we proceed?`,
     }
     console.log("");
     signale.pending("Running Homebrew uninstall\u2026");
-    await $2`brew uninstall --zap ${param}`;
+    await $2({ quiet: true })`brew uninstall --zap ${param}`;
     const brewPrefix = (await $2`brew --prefix`).stdout.trim();
     const caskroomEntry = `${brewPrefix}/Caskroom/${param}`;
     try {
@@ -441,7 +441,8 @@ Can you become an admin before we proceed?`,
   console.log("");
   signale.success("Done.");
 } catch (error) {
-  const message = error instanceof Error ? error.message : "An unexpected error occurred.";
+  const rawMessage = error instanceof Error ? error.message : "An unexpected error occurred.";
+  const message = rawMessage.split("\n").filter((l) => !/^\s+at /.test(l) && !/exit code:/.test(l)).join("\n").trim();
   const isPermissionError = message.includes("sudoers") || message.includes("Permission denied");
   const isCaskNotInstalled = message.includes("is not installed");
   console.log("");
@@ -462,18 +463,8 @@ Force-run ${chalk.bold(`brew uninstall --zap --force ${param}`)}?`,
     if (forceUninstall) {
       console.log("");
       signale.pending("Force-uninstalling cask\u2026");
-      await $2`brew uninstall --zap --force ${param}`;
+      await $2({ quiet: true })`brew uninstall --zap --force ${param}`;
       signale.success("Force uninstall complete.");
-      const brewPrefix = (await $2`brew --prefix`).stdout.trim();
-      const caskroomEntry = `${brewPrefix}/Caskroom/${param}`;
-      try {
-        await fs2.access(caskroomEntry);
-        await trash(caskroomEntry);
-        signale.success(
-          `Removed leftover Caskroom entry: ${chalk.dim(caskroomEntry)}`
-        );
-      } catch {
-      }
     }
   } else if (isCask && isPermissionError) {
     signale.info(
@@ -484,4 +475,16 @@ Force-run ${chalk.bold(`brew uninstall --zap --force ${param}`)}?`,
       `Cask "${param}" is not registered in Homebrew \u2014 skipping brew uninstall.`
     );
   }
+  if (isCask) {
+    const brewPrefix = (await $2`brew --prefix`).stdout.trim();
+    const caskroomEntry = `${brewPrefix}/Caskroom/${param}`;
+    try {
+      await fs2.access(caskroomEntry);
+      await trash(caskroomEntry);
+      signale.success(
+        `Removed leftover Caskroom entry: ${chalk.dim(caskroomEntry)}`
+      );
+    } catch {
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kud/soap-cli",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "An app cleaner cli for macOS",
   "main": "dist/index.js",
   "bin": {