@yaakapp/cli 0.0.12 → 0.0.14

package/install.cjs

@@ -2,15 +2,17 @@ const fs = require("fs");
 const path = require("path");
 const zlib = require("zlib");
 const https = require("https");
+const {getBinaryPath, getBinaryName} = require("./util");
 
 // Adjust the version you want to install. You can also make this dynamic.
 const VERSION = "0.0.10";
 
 // Windows binaries end with .exe so we need to special-case them.
-const binaryName = process.platform === "win32" ? "yaakcli.exe" : "yaakcli";
+const binaryName = getBinaryName();
 
 // Compute the path we want to emit the binary to
-const binaryDstPath = path.join(__dirname, "yaakcli", binaryName);
+const binaryInstallationPath = getBinaryPath()
+fs.mkdirSync(path.dirname(binaryInstallationPath), {recursive: true});
 
 function makeRequest(url) {
   return new Promise((resolve, reject) => {
@@ -82,31 +84,31 @@ async function downloadBinary() {
   console.log(`Extracting  ${tarballDownloadBuffer.length}`);
   const tarballBuffer = zlib.unzipSync(tarballDownloadBuffer);
 
-  const binaryDir = path.dirname(binaryDstPath);
-  console.log(`Creating dir ${binaryDir}`);
-  fs.mkdirSync(binaryDir, {recursive: true});
+  const dir = path.dirname(binaryInstallationPath);
+  console.log(`Creating dir ${dir}`);
+  fs.mkdirSync(dir, {recursive: true});
 
   // Extract binary from package and write to disk
-  console.log(`Writing tarball to ${binaryDstPath}`);
+  console.log(`Writing tarball to ${binaryInstallationPath}`);
   fs.writeFileSync(
-    binaryDstPath,
+    binaryInstallationPath,
     extractFileFromTarball(tarballBuffer, binaryName)
   );
 
-  console.log(`Extracting tarball to ${binaryDstPath}`);
+  console.log(`Extracting tarball to ${binaryInstallationPath}`);
   // Make binary executable
-  fs.chmodSync(binaryDstPath, "755");
+  fs.chmodSync(binaryInstallationPath, "755");
 
   console.log("Done");
 }
 
 function isPlatformSpecificPackageInstalled() {
-  return fs.existsSync(binaryDstPath)
+  return fs.existsSync(binaryInstallationPath)
 }
 
 // Skip downloading the binary if it was already installed via optionalDependencies
 if (!isPlatformSpecificPackageInstalled()) {
   downloadBinary().catch(console.error);
 } else {
-  console.log(`yaakcli already exists at ${binaryDstPath}`);
+  console.log(`yaakcli already exists at ${binaryInstallationPath}`);
 }

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@yaakapp/cli",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "files": [
     "install.cjs",
-    "bin/cli.cjs"
+    "uninstall.cjs",
+    "bin"
   ],
   "scripts": {
-    "postinstall": "node ./install.cjs"
+    "postinstall": "node ./install.cjs",
+    "preuninstall": "node ./uninstall.cjs"
   },
   "bin": {
     "yaakcli": "bin/yaakcli"