From fb1902448ebd78e83f2edf794adcd33621198329 Mon Sep 17 00:00:00 2001
From: Ashcon Partovi <ashcon@partovi.net>
Date: Tue, 24 Jan 2023 12:04:27 -0800
Subject: [PATCH] Add bunx to bin for npm installer

---
 packages/bun-npm/npm/bun/package.json | 3 ++-
 packages/bun-npm/scripts/npm-build.ts | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/bun-npm/npm/bun/package.json b/packages/bun-npm/npm/bun/package.json
index 7cb62f499b..caf2984477 100644
--- a/packages/bun-npm/npm/bun/package.json
+++ b/packages/bun-npm/npm/bun/package.json
@@ -16,7 +16,8 @@
   "bugs": "https://github.com/oven-sh/issues",
   "license": "MIT",
   "bin": {
-    "bun": "bin/bun"
+    "bun": "bin/bun",
+    "bunx": "bin/bun"
   },
   "repository": "https://github.com/oven-sh/bun",
   "scripts": {
diff --git a/packages/bun-npm/scripts/npm-build.ts b/packages/bun-npm/scripts/npm-build.ts
index d01032e2a9..83457903cd 100644
--- a/packages/bun-npm/scripts/npm-build.ts
+++ b/packages/bun-npm/scripts/npm-build.ts
@@ -78,6 +78,7 @@ async function buildBasePackage() {
     ),
     bin: {
       bun: "bin/bun",
+      bunx: "bin/bun",
     },
     os,
     cpu,
@@ -117,7 +118,10 @@ async function buildPackage(
 }
 
 function publishPackage(name: string, dryRun?: boolean): void {
-  const done = log(dryRun ? "Dry-run Publishing:" : "Publishing:", name);
+  const done = log(
+    dryRun ? "Dry-run Publishing:" : "Publishing:",
+    `${name}@${npmVersion}`,
+  );
   const { exitCode, stdout, stderr } = spawn(
     "npm",
     [