Install within zip

Author: Explosion-Scratch

index.js

@@ -20,7 +20,8 @@ const {
 } = require("./lib/utils");
 
 const HELP = `justinstall <github-url|website-url|file-url|local-file> [options]
-\tv1.1.0 - Just install anything. Supports .tar.gz, .zip, .dmg, .app, .pkg, and .deb files. 
+\tv1.2.0 - Just install anything. Supports .tar.gz, .zip, .dmg, .app, .pkg, and .deb files. 
+\tZIP files containing DMG or PKG packages are automatically detected and installed.
 \tBinaries will be installed to ~/.local/bin.
 
 \tOptions:

lib/installer.js

@@ -17,6 +17,7 @@ const {
   selectBestAsset,
   extractArchive,
   getBinaries,
+  processExtractedPackages,
   installApp,
   installPkg,
   mountDMG,
@@ -150,8 +151,7 @@ const performInstallation = async (args, isUpdate = false) => {
     }
 
     log.log(
-      `Successfully ${
-        isUpdate ? "updated" : "installed"
+      `Successfully ${isUpdate ? "updated" : "installed"
       }: ${installationResult.binaries.join(", ")}`
     );
   } finally {
@@ -236,8 +236,7 @@ const handleSmartUrlSource = async (
       log.debug("Assets found:");
       result.assets.forEach((asset, index) => {
         log.debug(
-          `  ${index + 1}. ${asset.name} (ext: ${
-            asset.extension || "none"
+          `  ${index + 1}. ${asset.name} (ext: ${asset.extension || "none"
           }, url: ${asset.browser_download_url})`
         );
       });
@@ -251,15 +250,14 @@ const handleSmartUrlSource = async (
       log.log("No compatible assets found. Available downloads:");
       result.assets.forEach((asset, index) => {
         log.log(
-          `  ${index + 1}. ${asset.name} (${
-            asset.extension || "no extension"
+          `  ${index + 1}. ${asset.name} (${asset.extension || "no extension"
           }) - ${asset.browser_download_url}`
         );
       });
 
       throw new Error(
         `Couldn't find a compatible download for ${platformInfo.platform}/${platformInfo.arch}. ` +
-          `Check manually: ${source.url}`
+        `Check manually: ${source.url}`
       );
     }
 
@@ -285,8 +283,7 @@ const handleWebsiteSource = async (source, platformInfo, capabilities, log) => {
     log.debug("Assets found:");
     assets.forEach((asset, index) => {
       log.debug(
-        `  ${index + 1}. ${asset.name} (ext: ${
-          asset.extension || "none"
+        `  ${index + 1}. ${asset.name} (ext: ${asset.extension || "none"
         }, url: ${asset.browser_download_url})`
       );
     });
@@ -300,15 +297,14 @@ const handleWebsiteSource = async (source, platformInfo, capabilities, log) => {
     log.log("No compatible assets found. Available downloads:");
     assets.forEach((asset, index) => {
       log.log(
-        `  ${index + 1}. ${asset.name} (${
-          asset.extension || "no extension"
+        `  ${index + 1}. ${asset.name} (${asset.extension || "no extension"
         }) - ${asset.browser_download_url}`
       );
     });
 
     throw new Error(
       `Couldn't find a compatible download for ${platformInfo.platform}/${platformInfo.arch}. ` +
-        `Check manually: ${source.url}`
+      `Check manually: ${source.url}`
     );
   }
 
@@ -324,10 +320,10 @@ const displayScriptPreview = (script, log) => {
   const { code, source, score } = script;
   log.debug(
     `Found installer code in ${source} (score: ${score}):\n\n\t` +
-      colors.fg.green +
-      code +
-      colors.reset +
-      "\n"
+    colors.fg.green +
+    code +
+    colors.reset +
+    "\n"
   );
 };
 
@@ -498,7 +494,7 @@ const handleGitHubSource = async (source, platformInfo, capabilities, log) => {
   if (!selected) {
     throw new Error(
       `Couldn't find a compatible binary for ${platformInfo.platform}/${platformInfo.arch}. ` +
-        `Check manually: https://github.com/${source.owner}/${source.repo}/releases`
+      `Check manually: https://github.com/${source.owner}/${source.repo}/releases`
     );
   }
 
@@ -627,14 +623,32 @@ const installSelected = async (selected, downloadPath, log) => {
       }
 
       log.debug(`Found binaries: ${extractedBinaries.join(", ")}`);
-      destinations = await installBinaries(
+
+      // Check if any of the extracted files are DMG or PKG packages
+      const packageResult = await processExtractedPackages(
         extractedBinaries,
         outputDir,
         selected.name,
         checkPath,
         log
       );
-      binariesList = extractedBinaries.map((bin) => path.basename(bin));
+
+      if (packageResult) {
+        // Use the package installation result
+        installationMethod = packageResult.method;
+        destinations = packageResult.destinations;
+        binariesList = packageResult.binaries;
+      } else {
+        // Fall back to regular binary installation
+        destinations = await installBinaries(
+          extractedBinaries,
+          outputDir,
+          selected.name,
+          checkPath,
+          log
+        );
+        binariesList = extractedBinaries.map((bin) => path.basename(bin));
+      }
       break;
   }
 

lib/installers.js

@@ -237,6 +237,91 @@ const getBinaries = (dir) => {
   return [...new Set(binaries)]; // Remove duplicates
 };
 
+/**
+ * Process extracted packages (DMG/PKG) found within ZIP archives
+ * @param {string[]} binaries - List of files found by getBinaries
+ * @param {string} outputDir - Directory containing extracted files
+ * @param {string} selectedName - Name of the original selected file
+ * @param {Function} checkPathFn - Function to check destination paths
+ * @param {Object} logger - Logger instance
+ * @returns {Object|null} Installation result or null if no packages found
+ */
+const processExtractedPackages = async (
+  binaries,
+  outputDir,
+  selectedName,
+  checkPathFn,
+  logger
+) => {
+  // 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"));
+
+  if (dmgFile) {
+    logger.log(`Found DMG file in ZIP: ${dmgFile}`);
+    const dmgPath = path.join(outputDir, dmgFile);
+
+    try {
+      mountDMG(dmgPath, outputDir, logger);
+      const dmgBinaries = getBinaries(outputDir);
+      logger.debug(
+        `Found ${dmgBinaries.length} items in DMG: ${dmgBinaries.join(", ")}`
+      );
+
+      const appFile = dmgBinaries.find((f) => f.endsWith(".app"));
+      const nestedPkgFile = dmgBinaries.find((f) => f.endsWith(".pkg"));
+
+      if (appFile) {
+        logger.log(`Installing .app bundle from DMG: ${appFile}`);
+        const destinations = await installApp(appFile, outputDir, checkPathFn, logger);
+        return {
+          method: "dmg_app",
+          destinations,
+          binaries: [appFile],
+        };
+      } else if (nestedPkgFile) {
+        logger.log(`Installing .pkg file from DMG: ${nestedPkgFile}`);
+        const destinations = installPkg(path.join(outputDir, nestedPkgFile));
+        return {
+          method: "dmg_pkg",
+          destinations,
+          binaries: [nestedPkgFile],
+        };
+      } else if (dmgBinaries.length > 0) {
+        logger.log("No .app or .pkg found in DMG, trying to install executables");
+        const destinations = await installBinaries(
+          dmgBinaries,
+          outputDir,
+          selectedName,
+          checkPathFn,
+          logger,
+          true // isMountedVolume = true
+        );
+        return {
+          method: "dmg_binaries",
+          destinations,
+          binaries: dmgBinaries.map((bin) => path.basename(bin)),
+        };
+      } else {
+        throw new Error("No installable files found in DMG");
+      }
+    } finally {
+      ejectDMG(outputDir, logger);
+    }
+  } else if (pkgFile) {
+    logger.log(`Found PKG file in ZIP: ${pkgFile}`);
+    const pkgPath = path.join(outputDir, pkgFile);
+    const destinations = installPkg(pkgPath);
+    return {
+      method: "pkg",
+      destinations,
+      binaries: [pkgFile],
+    };
+  }
+
+  return null; // No packages found
+};
+
 const installApp = async (appPath, outputDir, checkPathFn, logger = null) => {
   const dest = path.join("/Applications", path.basename(appPath));
   await checkPathFn(dest);
@@ -395,6 +480,7 @@ module.exports = {
   selectBestAsset,
   extractArchive,
   getBinaries,
+  processExtractedPackages,
   installApp,
   installPkg,
   mountDMG,