Fix proxy.setup always running after meteor.setup

Author: zodern

src/plugins/default/command-handlers.js

@@ -33,14 +33,8 @@ export function setup(api) {
   });
 
   log('exec => mup setup');
-  const config = api.getConfig();
 
-  return api.runCommand('docker.setup')
-    .then(() => {
-      if (config.proxy) {
-        return api.runCommand('proxy.setup');
-      }
-    });
+  return api.runCommand('docker.setup');
 }
 
 export function start() {

src/plugins/proxy/index.js

@@ -34,6 +34,14 @@ export const hooks = {
     if (api.getConfig().proxy) {
       api.runCommand('proxy.status');
     }
+  },
+  'post.meteor.setup'(api) {
+    // Only run hook on "mup setup"
+    const dockerSetup = api.commandHistory.find(({ name }) => name === 'default.setup');
+
+    if (api.getConfig().proxy && dockerSetup) {
+      return api.runCommand('proxy.setup');
+    }
   }
 };