@oclif/plugin-update 3.1.9 → 3.1.11

package/lib/update.d.ts

@@ -30,6 +30,7 @@ export declare class Updater {
     private notUpdatable;
     private alreadyOnVersion;
     private determineChannel;
+    private determinePlatform;
     private determineCurrentVersion;
     private findLocalVersion;
     private setChannel;

package/lib/update.js

@@ -119,19 +119,19 @@ class Updater {
         return s3SubDir;
     }
     s3ChannelManifestKey(channel) {
-        const { bin, platform, arch } = this.config;
+        const { bin, arch } = this.config;
         const s3SubDir = this.composeS3SubDir();
-        return path.join(s3SubDir, 'channels', channel, `${bin}-${platform}-${arch}-buildmanifest`);
+        return path.join(s3SubDir, 'channels', channel, `${bin}-${this.determinePlatform()}-${arch}-buildmanifest`);
     }
     s3VersionManifestKey(version, hash) {
-        const { bin, platform, arch } = this.config;
+        const { bin, arch } = this.config;
         const s3SubDir = this.composeS3SubDir();
-        return path.join(s3SubDir, 'versions', version, hash, `${bin}-v${version}-${hash}-${platform}-${arch}-buildmanifest`);
+        return path.join(s3SubDir, 'versions', version, hash, `${bin}-v${version}-${hash}-${this.determinePlatform()}-${arch}-buildmanifest`);
     }
     s3VersionIndexKey() {
-        const { bin, platform, arch } = this.config;
+        const { bin, arch } = this.config;
         const s3SubDir = this.composeS3SubDir();
-        return path.join(s3SubDir, 'versions', `${bin}-${platform}-${arch}-tar-gz.json`);
+        return path.join(s3SubDir, 'versions', `${bin}-${this.determinePlatform()}-${arch}-tar-gz.json`);
     }
     async fetchChannelManifest(channel) {
         const s3Key = this.s3ChannelManifestKey(channel);
@@ -166,7 +166,7 @@ class Updater {
             version,
             channel,
             bin: this.config.bin,
-            platform: this.config.platform,
+            platform: this.determinePlatform(),
             arch: this.config.arch,
             ext: 'gz',
         }));
@@ -176,7 +176,7 @@ class Updater {
             version,
             channel,
             bin: this.config.bin,
-            platform: this.config.platform,
+            platform: this.determinePlatform(),
             arch: this.config.arch,
         });
         const extraction = (0, tar_1.extract)(stream, baseDir, output, sha256gz);
@@ -231,6 +231,9 @@ class Updater {
         }
         return this.config.channel || 'stable';
     }
+    determinePlatform() {
+        return this.config.platform === 'wsl' ? 'linux' : this.config.platform;
+    }
     async determineCurrentVersion() {
         try {
             const currentVersion = await fs.readFile(this.clientBin, 'utf8');

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.1.9",
+  "version": "3.1.11",
   "commands": {
     "update": {
       "id": "update",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "3.1.9",
+  "version": "3.1.11",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {
@@ -14,12 +14,12 @@
     "inquirer": "^8.2.5",
     "lodash.throttle": "^4.1.1",
     "log-chopper": "^1.0.2",
-    "semver": "^7.3.8",
+    "semver": "^7.4.0",
     "tar-fs": "^2.1.1"
   },
   "devDependencies": {
-    "@oclif/plugin-help": "^5.2.8",
-    "@oclif/test": "^2.3.10",
+    "@oclif/plugin-help": "^5.2.9",
+    "@oclif/test": "^2.3.14",
     "@types/chai": "^4.3.4",
     "@types/cross-spawn": "^6.0.2",
     "@types/execa": "^0.9.0",
@@ -28,7 +28,7 @@
     "@types/inquirer": "^8.2.0",
     "@types/lodash.throttle": "^4.1.6",
     "@types/mocha": "^9",
-    "@types/node": "^14.18.38",
+    "@types/node": "^14.18.42",
     "@types/semver": "^7.3.13",
     "@types/supports-color": "^7.2.0",
     "@types/write-json-file": "^3.2.1",
@@ -39,7 +39,7 @@
     "globby": "^11.0.2",
     "mocha": "^9",
     "nock": "^13.3.0",
-    "oclif": "^3.7.0",
+    "oclif": "^3.7.3",
     "qqjs": "^0.3.11",
     "sinon": "^12.0.1",
     "ts-node": "^9.1.1",