vlt 0.0.0-5 → 0.0.0-7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vlt",
   "description": "The vlt CLI",
-  "version": "0.0.0-5",
+  "version": "0.0.0-7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vltpkg/vltpkg.git",
@@ -20,11 +20,11 @@
     "vlx": "./vlx"
   },
   "optionalDependencies": {
-    "@vltpkg/cli-linux-x64": "0.0.0-5",
-    "@vltpkg/cli-linux-arm64": "0.0.0-5",
-    "@vltpkg/cli-darwin-x64": "0.0.0-5",
-    "@vltpkg/cli-darwin-arm64": "0.0.0-5",
-    "@vltpkg/cli-win32-x64": "0.0.0-5"
+    "@vltpkg/cli-linux-x64": "0.0.0-7",
+    "@vltpkg/cli-linux-arm64": "0.0.0-7",
+    "@vltpkg/cli-darwin-x64": "0.0.0-7",
+    "@vltpkg/cli-darwin-arm64": "0.0.0-7",
+    "@vltpkg/cli-win32-x64": "0.0.0-7"
   },
   "scripts": {
     "postinstall": "node postinstall.cjs"

package/postinstall.cjs

@@ -7,11 +7,18 @@ 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(
@@ -34,9 +41,7 @@ const atomicCopySync = (source, target) => {
     fs.renameSync(tmp, target)
     fs.chmodSync(target, execMode)
   } catch (err) {
-    try {
-      fs.unlinkSync(tmp)
-    } catch {}
+    unlinkSyncSafe(tmp)
     throw new Error(`Could not copy platform bin`, {
       cause: {
         source,
@@ -48,9 +53,13 @@ const atomicCopySync = (source, target) => {
   }
 }
 
-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/vlix

@@ -1,25 +1 @@
-#!/usr/bin/env node
-
-import { readFileSync } from 'fs'
-import { resolve } from 'path'
-import os from '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/vlr

@@ -1,25 +1 @@
-#!/usr/bin/env node
-
-import { readFileSync } from 'fs'
-import { resolve } from 'path'
-import os from '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/vlrx

@@ -1,25 +1 @@
-#!/usr/bin/env node
-
-import { readFileSync } from 'fs'
-import { resolve } from 'path'
-import os from '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/vlt

@@ -1,25 +1 @@
-#!/usr/bin/env node
-
-import { readFileSync } from 'fs'
-import { resolve } from 'path'
-import os from '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

@@ -1,25 +1 @@
-#!/usr/bin/env node
-
-import { readFileSync } from 'fs'
-import { resolve } from 'path'
-import os from '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."