Merge pull request oclif#26 from sumwatshade/fix/install-no-reexec

fix: no reexec on install
intuit · Jun 17, 2021 · e23b7e4 · e23b7e4
2 parents ca44f2f + f55aa79
commit e23b7e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/commands/install.ts b/src/commands/install.ts
@@ -71,7 +71,7 @@ export default class InstallCommand extends UpdateCommand {
       this.debug(`Updating to ${this.updatedVersion}`);
       const reason = await this.skipUpdate();
       if (reason) cli.action.stop(reason || 'done');
-      else await this.update(manifest, this.channel, explicitVersion);
+      else await this.update(manifest, this.channel, explicitVersion, false);
       this.debug('tidy');
       await this.tidy();
       await this.config.runHook('update', { channel: this.channel });

diff --git a/src/commands/update.ts b/src/commands/update.ts
@@ -149,7 +149,9 @@ export default class UpdateCommand extends Command {
       return body;
     } catch (error) {
       if (error.statusCode === 403)
-        throw new Error(`HTTP 403: Invalid channel ${this.channel}`);
+        throw new Error(
+          `HTTP 403: This could mean that you are being restricted from accessing this version, or that you are providing an invalid channel (${this.channel})`,
+        );
       throw error;
     }
   }
@@ -226,6 +228,7 @@ export default class UpdateCommand extends Command {
     manifest: IManifest,
     channel = this.channel,
     targetVersion?: string,
+    reexec = true,
   ) {
     const { channel: manifestChannel } = manifest;
     if (manifestChannel) channel = manifestChannel;
@@ -247,7 +250,9 @@ export default class UpdateCommand extends Command {
     await this.setChannel();
     await this.createBin(this.updatedVersion);
     await this.touch();
-    await this.reexec();
+    if (reexec) {
+      await this.reexec();
+    }
   }
 
   protected async updateToExistingVersion(version: string) {