From 2a6af24499f9420d00b03be3e5ab65219383d691 Mon Sep 17 00:00:00 2001
From: Bsian <bsian@staff.libraryofcode.us>
Date: Sun, 3 May 2020 23:55:57 +0100
Subject: [PATCH] Only show command line output on error

---
 src/commands/pull.ts | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/commands/pull.ts b/src/commands/pull.ts
index cc21674..8ab1183 100644
--- a/src/commands/pull.ts
+++ b/src/commands/pull.ts
@@ -16,31 +16,28 @@ export default class Pull extends Command {
     try {
       if (this.client.updating) return message.channel.createMessage(`${this.client.stores.emojis.error} ***Update in progress***`);
       this.client.updating = true;
-      const updateMessage = await message.channel.createMessage(`${this.client.stores.emojis.loading} ***Fetching latest commit...***\n\`\`\`sh\n$ git pull\n\`\`\``);
+      const updateMessage = await message.channel.createMessage(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`);
       let pull: string;
 
       try {
         pull = await this.client.util.exec('git pull', { cwd: '/opt/CloudServices' });
       } catch (error) {
-        const updatedMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.error} ***Could not fetch latest commit***`)
-          .replace(/```$/, `${error.message}\n\`\`\``);
+        const updatedMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.error} ***Could not fetch latest commit***\n`
+          + `\`\`\`\n${error.message}\n\`\`\``);
         this.client.updating = false;
         return updateMessage.edit(updatedMessage);
       }
       if (pull.includes('Already up to date')) {
-        const updatedMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.success} ***No updates available***`)
-          .replace(/```$/, `${pull}\n\`\`\``);
+        const updatedMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.success} ***No updates available***`);
         this.client.updating = false;
         return updateMessage.edit(updatedMessage);
       }
       if (!pull.includes('origin/master') && !pull.includes(' changed, ')) {
-        const updatedMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.error} ***Unexpected git output***`)
-          .replace(/```$/, `${pull}\n\`\`\``);
+        const updatedMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.error} ***Unexpected git output***`);
         this.client.updating = false;
         return updateMessage.edit(updatedMessage);
       }
-      const continueMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.success} ***Pulled latest commit***\n${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`)
-        .replace(/```$/, `${pull}\n$ yarn install\n\`\`\``);
+      const continueMessage = updateMessage.content.replace(`${this.client.stores.emojis.loading} ***Fetching latest commit...***`, `${this.client.stores.emojis.success} ***Pulled latest commit***\n${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`);
       const passedPull = await updateMessage.edit(continueMessage);
 
 
@@ -49,22 +46,20 @@ export default class Pull extends Command {
         install = await this.client.util.exec('yarn install', { cwd: '/opt/CloudServices' });
       } catch (error) {
         this.client.updating = false;
-        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.error} ***Failed to reinstall dependencies***`)
-          .replace(/```$/, `${error.message}\n\`\`\``);
+        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.error} ***Failed to reinstall dependencies***\n`
+          + `\`\`\`\n${error.message}\n\`\`\``);
         return updateMessage.edit(updatedMessage);
       }
       let updatedPackages: Message;
       if (install.includes('Already up-to-date')) {
-        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.success} ***No dependency updates available***\n${this.client.stores.emojis.loading} ***Rebuilding files...***`)
-          .replace(/```$/, `${install}\n$ yarn run build\n\`\`\``);
+        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.success} ***No dependency updates available***\n${this.client.stores.emojis.loading} ***Rebuilding files...***`);
         updatedPackages = await updateMessage.edit(updatedMessage);
       } else if (install.includes('success Saved lockfile.')) {
-        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.success} ***Updated dependencies***\n${this.client.stores.emojis.loading} ***Rebuilding files...***`)
-          .replace(/```$/, `${install}\n$ yarn run build\n\`\`\``);
+        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.success} ***Updated dependencies***\n${this.client.stores.emojis.loading} ***Rebuilding files...***`);
         updatedPackages = await updateMessage.edit(updatedMessage);
       } else {
-        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.error} ***Unexpected yarn install output***`)
-          .replace(/```$/, `${pull}\n\`\`\``);
+        const updatedMessage = passedPull.content.replace(`${this.client.stores.emojis.loading} ***Reinstalling dependencies...***`, `${this.client.stores.emojis.error} ***Unexpected yarn install output***\n`
+          + `\`\`\`\n${pull}\n\`\`\``);
         this.client.updating = false;
         return updateMessage.edit(updatedMessage);
       }
@@ -73,14 +68,13 @@ export default class Pull extends Command {
       try {
         build = await this.client.util.exec('yarn run build', { cwd: '/opt/CloudServices' });
       } catch (error) {
-        const updatedMessage = updatedPackages.content.replace(`${this.client.stores.emojis.loading} ***Rebuilding files...***`, `${this.client.stores.emojis.error} ***Failed to rebuild files***`)
-          .replace(/```$/, `${error.message}\n\`\`\``);
+        const updatedMessage = updatedPackages.content.replace(`${this.client.stores.emojis.loading} ***Rebuilding files...***`, `${this.client.stores.emojis.error} ***Failed to rebuild files***\n`
+          + `\`\`\`\n${error.message}\n\`\`\``);
         this.client.buildError = true;
         this.client.updating = false;
         return updateMessage.edit(updatedMessage);
       }
-      const finalMessage = updatedPackages.content.replace(`${this.client.stores.emojis.loading} ***Rebuilding files...***`, `${this.client.stores.emojis.success} ***Files rebuilt***`)
-        .replace(/```$/, `${build}\n\`\`\``);
+      const finalMessage = updatedPackages.content.replace(`${this.client.stores.emojis.loading} ***Rebuilding files...***`, `${this.client.stores.emojis.success} ***Files rebuilt***`);
       this.client.updating = false;
       this.client.buildError = false;
       return updateMessage.edit(finalMessage);