From df2c45fee21a3415a9c8e95049727e9bded758fe Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Mon, 28 Jun 2021 11:10:46 -0700
Subject: [PATCH] Fix NPM fleetctl with new release archive formats (#1238)

- Wrap extracted archives in directory.
- Adjust naming of archives and directories.
---
 .goreleaser.yml                 | 9 ++++++---
 tools/fleetctl-npm/package.json | 2 +-
 tools/fleetctl-npm/run.js       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 946e21903bee..fcdcf5e37d1b 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -57,27 +57,30 @@ archives:
     builds:
       - fleet
       - fleetctl
-    name_template: fleet_{{.Version}}_{{.Os}}
+    name_template: fleet_v{{.Version}}_{{.Os}}
     replacements:
       darwin: macos
     format_overrides:
       - goos: windows
         format: zip
+    wrap_in_directory: true
 
   - id: fleetctl
     builds:
       - fleetctl
-    name_template: fleetctl_{{.Version}}_{{.Os}}
+    name_template: fleetctl_v{{.Version}}_{{.Os}}
     replacements:
       darwin: macos
+    wrap_in_directory: true
 
   - id: fleetctl-zip
     builds:
       - fleetctl
-    name_template: fleetctl_{{.Version}}_{{.Os}}
+    name_template: fleetctl_v{{.Version}}_{{.Os}}
     format: zip
     replacements:
       darwin: macos
+    wrap_in_directory: true
 
 dockers:
   - goos: linux
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index e602ddb02104..20f4e4ead4b1 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "v4.0.0-rc3",
+  "version": "v4.0.0-rc3-1",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"
diff --git a/tools/fleetctl-npm/run.js b/tools/fleetctl-npm/run.js
index f04f0e597c65..9c17c5d5790b 100755
--- a/tools/fleetctl-npm/run.js
+++ b/tools/fleetctl-npm/run.js
@@ -19,7 +19,7 @@ const strippedVersion = version.replace(/-[0-9]+/i, "");
 const binDir = path.join(__dirname, "install");
 // Determine the install directory by version so that we can detect when we need
 // to upgrade to a new version.
-const installDir = path.join(binDir, version);
+const installDir = path.join(binDir, strippedVersion);
 
 const platform = () => {
   switch (os.type()) {