vlt 0.0.0-0.1740089541607 → 0.0.0-10

package/README.md

@@ -6,4 +6,5 @@ The command line interface for `vlt`.
 
 ## Documentation
 
-Visit [docs.vlt.sh](https://docs.vlt.sh) to see the full documentation.
+Visit [docs.vlt.sh](https://docs.vlt.sh) to see the full
+documentation.

package/package.json

@@ -1,28 +1,32 @@
 {
   "name": "vlt",
-  "version": "0.0.0-0.1740089541607",
   "description": "The vlt CLI",
-  "license": "BSD-2-Clause-Patent",
-  "keywords": [
-    "vltpkg"
-  ],
+  "version": "0.0.0-10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
-    "directory": "src/vlt"
+    "directory": "infra/cli-compiled"
   },
+  "license": "BSD-2-Clause-Patent",
   "type": "module",
+  "keywords": [
+    "vltpkg"
+  ],
+  "bin": {
+    "vlxl": "./vlxl",
+    "vlr": "./vlr",
+    "vlrx": "./vlrx",
+    "vlt": "./vlt",
+    "vlx": "./vlx"
+  },
   "optionalDependencies": {
-    "@vltpkg/cli-darwin-arm64": "0.0.0-0.1740089541607",
-    "@vltpkg/cli-darwin-x64": "0.0.0-0.1740089541607",
-    "@vltpkg/cli-linux-arm64": "0.0.0-0.1740089541607",
-    "@vltpkg/cli-linux-x64": "0.0.0-0.1740089541607",
-    "@vltpkg/cli-win32-x64": "0.0.0-0.1740089541607"
+    "@vltpkg/cli-linux-x64": "0.0.0-10",
+    "@vltpkg/cli-linux-arm64": "0.0.0-10",
+    "@vltpkg/cli-darwin-x64": "0.0.0-10",
+    "@vltpkg/cli-darwin-arm64": "0.0.0-10",
+    "@vltpkg/cli-win32-x64": "0.0.0-10"
   },
   "scripts": {
-    "postinstall": "node postinstall.js"
-  },
-  "bin": {
-    "vlt": "vlt"
+    "postinstall": "node postinstall.cjs"
   }
-}
+}

package/{postinstall.js → postinstall.cjs}

@@ -4,13 +4,21 @@ const os = require('os')
 const { join, dirname, basename } = require('path')
 const fs = require('fs')
 
+const execMode = 0o777 & ~process.umask()
 const platform = os.platform()
 const arch = os.arch()
+const isWindows = platform === 'win32'
 const rootPackage = __dirname
-const bins = Object.values(
-  require(join(rootPackage, 'package.json')).bin,
+const pkg = JSON.parse(
+  fs.readFileSync(join(rootPackage, 'package.json'), 'utf8'),
 )
 
+const unlinkSyncSafe = file => {
+  try {
+    fs.unlinkSync(file)
+  } catch {}
+}
+
 const platformPkg = (() => {
   try {
     return dirname(
@@ -31,21 +39,27 @@ const atomicCopySync = (source, target) => {
   try {
     fs.copyFileSync(source, tmp)
     fs.renameSync(tmp, target)
+    fs.chmodSync(target, execMode)
   } catch (err) {
-    try {
-      fs.unlinkSync(tmp)
-    } catch (err2) {
-      throw new Error(`Could not unlink tmp platform bin`, {
-        cause: err2,
-      })
-    }
-    throw new Error(`Could not copy platform bin`, { cause: err })
+    unlinkSyncSafe(tmp)
+    throw new Error(`Could not copy platform bin`, {
+      cause: {
+        source,
+        target,
+        tmp,
+        err,
+      },
+    })
   }
 }
 
-for (const binPath of bins) {
+for (const binPath of Object.values(pkg.bin)) {
+  const platformBinPath = `${binPath}${isWindows ? '.exe' : ''}`
   atomicCopySync(
-    join(platformPkg, binPath + `${os === 'win32' ? '.exe' : ''}`),
-    join(rootPackage, binPath),
+    join(platformPkg, platformBinPath),
+    join(rootPackage, platformBinPath),
   )
+  if (platformBinPath !== binPath) {
+    unlinkSyncSafe(join(rootPackage, binPath))
+  }
 }

package/vlr

@@ -0,0 +1 @@
+"If this file exists, the postinstall script failed to run."

package/vlrx

@@ -0,0 +1 @@
+"If this file exists, the postinstall script failed to run."

package/vlt

@@ -1,27 +1 @@
-#!/usr/bin/env node
-
-/* eslint-disable @typescript-eslint/no-require-imports */
-
-const { readFileSync } = require('fs')
-const { resolve } = require('path')
-const os = require('os')
-
-const validPlatforms = Object.keys(
-  JSON.parse(readFileSync(resolve(__dirname, 'package.json'), 'utf8'))
-    .optionalDependencies,
-).map(name => name.replace('@vltpkg/cli-', ''))
-
-const currentPlatform = `${os.platform()}-${os.arch()}`
-
-console.error(
-  validPlatforms.includes(currentPlatform) ?
-    `This is a supported platform but the matching binary was not found.
-This could be due to --no-optional or --ignore-scripts being used when installing.
-Try again without either of those flags.
-Otherwise check for error logs from the postinstall script.`
-  : `The current platform is not supported by this package.`,
-)
-console.error(`Valid platforms: ${JSON.stringify(validPlatforms)}`)
-console.error(`Current platform: ${JSON.stringify(currentPlatform)}`)
-
-process.exit(1)
+"If this file exists, the postinstall script failed to run."

package/vlx

@@ -0,0 +1 @@
+"If this file exists, the postinstall script failed to run."

package/vlxl

@@ -0,0 +1 @@
+"If this file exists, the postinstall script failed to run."