Update system

Author: Explosion-Scratch

index.js

@@ -5,6 +5,7 @@ const {
   checkForUpdates,
   performUpdate,
   listInstalled,
+  performUninstall,
 } = require("./lib/updater");
 const {
   interactiveSearch,
@@ -28,6 +29,7 @@ const HELP = `justinstall <github-url|website-url|file-url|local-file> [options]
 \t  --search [query]     Interactive search for GitHub repositories, or direct search with query
 \t  --first <query>      Find and install most-starred repo matching query
 \t  --update [package]   Update all packages or specific package
+\t  --uninstall <name>   Uninstall a previously installed package
 \t  --list               List installed packages
 \t  -h, --help           Show this help
 
@@ -57,14 +59,36 @@ const handleUpdateCommand = async (flags, args) => {
     const customFilePath = args[0]; // Optional custom file path
 
     log.debug(`Checking for updates: ${flags.updatePackage}`);
-    const updates = await checkForUpdates(flags.updatePackage);
+    const updateInfo = await checkForUpdates(flags.updatePackage);
 
-    if (updates.length === 0) {
+    // If we definitively know there is no update and there wasn't an error, exit early
+    if (updateInfo.hasUpdate === false && !updateInfo.error) {
       log.log(`${flags.updatePackage} is already up to date`);
       return;
     }
 
-    const updateInfo = updates[0];
+    // If we can't verify the version or canUpdate flag is missing, attempt reinstall
+    const unverifiable =
+      updateInfo.error === true ||
+      updateInfo.hasUpdate === undefined ||
+      updateInfo.canUpdate === undefined;
+
+    if (unverifiable) {
+      log.warn(
+        `Unable to verify current version for ${flags.updatePackage}. Will reinstall to ensure freshness.`
+      );
+      if (await confirm(`Proceed to reinstall ${flags.updatePackage}?`)) {
+        await performUpdate(
+          {
+            name: flags.updatePackage,
+            source: updateInfo.source,
+          },
+          customFilePath
+        );
+      }
+      return;
+    }
+
     if (!updateInfo.canUpdate) {
       log.warn(
         `Update available for ${flags.updatePackage} but ${updateInfo.reason}`
@@ -122,6 +146,15 @@ const main = async () => {
     return;
   }
 
+  if (flags.uninstall) {
+    const name = flags.uninstallPackage;
+    if (!name) {
+      throw new Error("--uninstall requires a package name");
+    }
+    await performUninstall(name);
+    return;
+  }
+
   if (flags.list) {
     listInstalled();
     return;

lib/installer.js

@@ -600,6 +600,10 @@ const installSelected = async (selected, downloadPath, log) => {
         log
       );
       binariesList = [selected.name];
+      // Ask to open app
+      if (await confirm(`Open app ${path.basename(destinations[0])}?`)) {
+        execSync(`open -n ${JSON.stringify(destinations[0])}`);
+      }
       break;
 
     default:
@@ -638,6 +642,12 @@ const installSelected = async (selected, downloadPath, log) => {
         installationMethod = packageResult.method;
         destinations = packageResult.destinations;
         binariesList = packageResult.binaries;
+        if (installationMethod === "archive_app") {
+          // Ask to open app
+          if (await confirm(`Open app ${path.basename(destinations[0])}?`)) {
+            execSync(`open -n ${JSON.stringify(destinations[0])}`);
+          }
+        }
       } else {
         // Fall back to regular binary installation
         destinations = await installBinaries(

lib/installers.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const os = require("os");
 const { execSync } = require("child_process");
+const { extractName } = require("./config");
 
 const getPlatformInfo = () => {
   const arch = process.arch;
@@ -237,6 +238,8 @@ const getBinaries = (dir) => {
   return [...new Set(binaries)]; // Remove duplicates
 };
 
+// Use extractName from config for consistent name normalization
+
 /**
  * Process extracted packages (DMG/PKG) found within ZIP archives
  * @param {string[]} binaries - List of files found by getBinaries
@@ -253,6 +256,20 @@ const processExtractedPackages = async (
   checkPathFn,
   logger
 ) => {
+  // If an .app bundle was extracted from the archive, install it as a macOS app
+  const appBundle = binaries.find((f) => f.toLowerCase().endsWith(".app"));
+  if (appBundle && process.platform === "darwin") {
+    if (logger) {
+      logger.log(`Installing .app bundle from archive: ${appBundle}`);
+    }
+    const destinations = await installApp(appBundle, outputDir, checkPathFn, logger);
+    return {
+      method: "archive_app",
+      destinations,
+      binaries: [appBundle],
+    };
+  }
+
   // Look for DMG or PKG files in the extracted binaries
   const dmgFile = binaries.find((f) => f.toLowerCase().endsWith(".dmg"));
   const pkgFile = binaries.find((f) => f.toLowerCase().endsWith(".pkg"));
@@ -323,7 +340,10 @@ const processExtractedPackages = async (
 };
 
 const installApp = async (appPath, outputDir, checkPathFn, logger = null) => {
-  const dest = path.join("/Applications", path.basename(appPath));
+  const original = path.basename(appPath);
+  const cleanedBase = extractName({ name: original }) || original.replace(/\.app$/i, "");
+  const cleaned = cleanedBase.replace(/\.app$/i, "");
+  const dest = path.join("/Applications", `${cleaned}.app`);
   await checkPathFn(dest);
 
   fs.cpSync(path.join(outputDir, appPath), dest, { recursive: true });
@@ -424,7 +444,7 @@ const installBinaries = async (
 
   for (const binary of binaries) {
     const binaryPath = path.join(outputDir, binary);
-    const cleanName = cleanBinaryName(selectedName);
+    const cleanName = extractName({ name: selectedName });
     const dest = path.join(os.homedir(), ".local", "bin", cleanName);
 
     await checkPathFn(dest);
@@ -462,17 +482,6 @@ const installDeb = (debPath) => {
   return ["System-wide deb installation"];
 };
 
-const cleanBinaryName = (name) => {
-  return name
-    .replace(/\.(tar\.gz|zip|dmg|pkg|deb|app)$/i, "")
-    .replace(/v?[0-9]+\.[0-9]+\.[0-9]+/i, "")
-    .replace(
-      /(?:darwin|linux|windows|mac|osx|x64|arm64|aarch64|universal)/gi,
-      ""
-    )
-    .replace(/[ _\-\.]+$/, "")
-    .replace(/^[ _\-\.]+/, "");
-};
 
 module.exports = {
   getPlatformInfo,
@@ -487,5 +496,4 @@ module.exports = {
   ejectDMG,
   installBinaries,
   installDeb,
-  cleanBinaryName,
 };

lib/updater.js

@@ -3,7 +3,7 @@ const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
 
-const { loadConfig, addInstallation, hashFile } = require("./config");
+const { loadConfig, addInstallation, hashFile, removeInstallation } = require("./config");
 const { parseSource, getGitHubAssets, downloadFromUrl } = require("./sources");
 const { createLogger, confirm, fileSize } = require("./utils");
 
@@ -65,8 +65,8 @@ const checkGitHubUpdate = async (installation) => {
       source.repo
     );
 
-    // Check if there's a newer commit/tag
-    const hasUpdate = commit !== oldCommit;
+    // Check if there's a newer tag (more reliable than commit for releases)
+    const hasUpdate = tag !== installation.version;
 
     if (!hasUpdate) {
       return { name, hasUpdate: false, reason: "Already up to date" };
@@ -76,7 +76,8 @@ const checkGitHubUpdate = async (installation) => {
     const newAsset = assets.find(
       (asset) =>
         asset.name.includes(selected.name.split(".")[0]) ||
-        asset.extension === selected.extension
+        asset.extension === selected.extension ||
+        asset.name.includes(name) // Also check if asset name contains the package name
     );
 
     if (!newAsset) {
@@ -161,7 +162,18 @@ const checkFileUpdate = async (installation) => {
 
 const performUpdate = async (updateInfo, customFilePath = null) => {
   const log = createLogger();
-  const { name, source } = updateInfo;
+  const { name } = updateInfo;
+
+  // Ensure we have source info; if missing, fetch from installation history
+  let source = updateInfo.source;
+  if (!source) {
+    const config = loadConfig();
+    const installation = config.find((item) => item.name === name);
+    if (!installation) {
+      throw new Error(`No installation record found for '${name}'`);
+    }
+    source = installation.source;
+  }
 
   log.log(`Updating ${name}...`);
 
@@ -173,6 +185,29 @@ const performUpdate = async (updateInfo, customFilePath = null) => {
 
   try {
     await performInstallation(originalArgs, true); // isUpdate = true
+
+    // After successful update, refresh the installation record with new version info
+    if (updateInfo.newTag) {
+      const config = loadConfig();
+      const installation = config.find((item) => item.name === name);
+      if (installation) {
+        installation.version = updateInfo.newTag;
+        installation.commit = updateInfo.newCommit;
+        installation.date = new Date().toISOString();
+
+        // Update the selected asset info if we have it
+        if (updateInfo.newAsset) {
+          installation.selected.name = updateInfo.newAsset.name;
+          installation.selected.size = updateInfo.newAsset.size;
+          installation.selected.downloadUrl = updateInfo.newAsset.browser_download_url;
+        }
+
+        const { saveConfig } = require("./config");
+        saveConfig(config);
+        log.debug(`Updated installation record for ${name} to version ${updateInfo.newTag}`);
+      }
+    }
+
     log.log(`Successfully updated ${name}`);
   } catch (error) {
     log.error(`Failed to update ${name}: ${error.message}`);
@@ -208,9 +243,70 @@ const removePackageHistory = (packageName) => {
   removeInstallation(packageName);
 };
 
+const getPathSize = (p) => {
+  const stat = fs.statSync(p);
+  if (stat.isFile()) return stat.size;
+  if (stat.isDirectory()) {
+    let total = 0;
+    for (const entry of fs.readdirSync(p)) {
+      total += getPathSize(path.join(p, entry));
+    }
+    return total;
+  }
+  return 0;
+};
+
+const performUninstall = async (packageName) => {
+  const log = createLogger();
+  const config = loadConfig();
+  const installation = config.find((item) => item.name === packageName);
+
+  if (!installation) {
+    throw new Error(`Package '${packageName}' not found in installation history`);
+  }
+
+  const destinations = installation.installation?.destinations || [];
+  if (destinations.length === 0) {
+    throw new Error(`No recorded destinations for '${packageName}'`);
+  }
+
+  let totalBytes = 0;
+  for (const dest of destinations) {
+    if (fs.existsSync(dest)) {
+      try {
+        totalBytes += getPathSize(dest);
+      } catch (e) {
+        // Ignore size calc errors; proceed with uninstall
+      }
+    }
+  }
+
+  const { fileSize, confirm } = require("./utils");
+  const pretty = fileSize(totalBytes, true, 1);
+  log.log(`Uninstalling ${packageName} (${pretty})`);
+  if (!(await confirm(`Proceed to uninstall ${packageName}?`))) {
+    throw new Error("Uninstall canceled by user");
+  }
+
+  for (const dest of destinations) {
+    if (fs.existsSync(dest)) {
+      try {
+        fs.rmSync(dest, { recursive: true, force: true });
+        log.debug(`Removed ${dest}`);
+      } catch (e) {
+        log.warn(`Failed to remove ${dest}: ${e.message}`);
+      }
+    }
+  }
+
+  removeInstallation(packageName);
+  log.log(`Successfully uninstalled ${packageName}`);
+};
+
 module.exports = {
   checkForUpdates,
   performUpdate,
   listInstalled,
   removePackageHistory,
+  performUninstall,
 };

lib/utils.js

@@ -66,8 +66,7 @@ const confirm = (question, defaultAnswer = "y") => {
     });
 
     rli.question(
-      `${colors.fg.yellow}${question}${colors.reset} ${colors.fg.blue}(${
-        defaultAnswer.toLowerCase() === "y" ? "Y" : "y"
+      `${colors.fg.yellow}${question}${colors.reset} ${colors.fg.blue}(${defaultAnswer.toLowerCase() === "y" ? "Y" : "y"
       }/${defaultAnswer.toLowerCase() === "n" ? "N" : "n"})${colors.reset} `,
       (ans) => {
         let result =
@@ -189,6 +188,13 @@ const parseFlags = (args) => {
           flags.updatePackage = args[i + 1];
           i++; // Skip the package name in next iteration
         }
+      } else if (flagName === "uninstall") {
+        flags.uninstall = true;
+        // Check if next arg is a package name
+        if (i + 1 < args.length && !args[i + 1].startsWith("-")) {
+          flags.uninstallPackage = args[i + 1];
+          i++; // Skip the package name in next iteration
+        }
       } else if (flagName === "help") {
         flags.help = true;
       } else if (flagName === "list") {