@mistydemeo/cargodisttest 0.2.241 → 0.2.242

package/binary-install.js

@@ -13,7 +13,7 @@ const error = (msg) => {
 };
 
 class Package {
-  constructor(name, url, binaries) {
+  constructor(name, url, zipExt, binaries) {
     let errors = [];
     if (typeof url !== "string") {
       errors.push("url must be a string");
@@ -49,6 +49,7 @@ class Package {
     }
     this.url = url;
     this.name = name;
+    this.zipExt = zipExt;
     this.installDirectory = join(__dirname, "node_modules", ".bin_real");
     this.binaries = binaries;
 
@@ -97,10 +98,13 @@ class Package {
             const sink = res.data.pipe(createWriteStream(tempFile));
             sink.on("error", (err) => reject(err));
             sink.on("finish", () => {
-              if (/\.tar\.*/.test(filename)) {
+              if (/\.tar\.*/.test(this.zipExt)) {
                 const result = spawnSync("tar", [
                   "xf",
                   tempFile,
+                  // The tarballs are stored with a leading directory
+                  // component; we strip one component in the
+                  // shell installers too.
                   "--strip-components",
                   "1",
                   "-C",
@@ -111,7 +115,7 @@ class Package {
                 } else {
                   reject(result.error);
                 }
-              } else if (filename.endsWith(".zip")) {
+              } else if (this.zipExt == ".zip") {
                 const result = spawnSync("unzip", [
                   "-q",
                   tempFile,
@@ -124,7 +128,7 @@ class Package {
                   reject(result.error);
                 }
               } else {
-                reject(`Unrecognized file extension: ${filename}`);
+                reject(new Error(`Unrecognized file extension: ${filename}`));
               }
             });
           });

package/binary.js

@@ -94,7 +94,8 @@ const getPlatform = () => {
 const getPackage = () => {
   const platform = getPlatform();
   const url = `${artifactDownloadUrl}/${platform.artifactName}`;
-  let binary = new Package(name, url, platform.bins);
+  let ext = platform.zipExt;
+  let binary = new Package(name, url, ext, platform.bins);
 
   return binary;
 };

package/npm-shrinkwrap.json

@@ -23,7 +23,7 @@
       "hasInstallScript": true,
       "license": "MIT OR Apache-2.0",
       "name": "@mistydemeo/cargodisttest",
-      "version": "0.2.241"
+      "version": "0.2.242"
     },
     "node_modules/@isaacs/cliui": {
       "dependencies": {
@@ -711,5 +711,5 @@
     }
   },
   "requires": true,
-  "version": "0.2.241"
+  "version": "0.2.242"
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "artifactDownloadUrl": "https://mistydemeo.artifacts.axodotdev.host/axolotlsay/ax_B5CW0tu-pJKHxvDW-7h8g",
+  "artifactDownloadUrl": "https://mistydemeo.artifacts.axodotdev.host/axolotlsay/ax_1WaEQ9vfLPTCa-HqhplMb",
   "bin": {
     "axolotlsay": "run-axolotlsay.js"
   },
@@ -76,7 +76,7 @@
       "zipExt": ".tar.xz"
     }
   },
-  "version": "0.2.241",
+  "version": "0.2.242",
   "volta": {
     "node": "18.14.1",
     "npm": "9.5.0"