@@ -54,20 +54,7 @@ function initLogLevel() {
 
 var cli = {};
 
-cli.run = function() {
-  config.init();
-  cache.init();
-
-  initColor();
-  initIcon();
-  initLogLevel();
-
-  Plugin.init() && Plugin.save();
-
-  process.stdout.on('error', function(e) {
-    if (e.code === 'EPIPE') process.exit();
-  });
-
+function runCommand() {
   var yargs = require('yargs');
   h.width = yargs.terminalWidth();
   yargs.commandDir('commands')
@@ -78,6 +65,30 @@ cli.run = function() {
     .epilog('Seek more help at https://skygragon.github.io/leetcode-cli/commands')
     .wrap(Math.min(h.width, 120))
     .argv;
+}
+
+cli.run = function() {
+  process.stdout.on('error', function(e) {
+    if (e.code === 'EPIPE') process.exit();
+  });
+
+  config.init();
+  cache.init();
+
+  initColor();
+  initIcon();
+  initLogLevel();
+
+  if (Plugin.init()) {
+    Plugin.save();
+    runCommand();
+  } else {
+    Plugin.installMissings(function(e) {
+      if (e) return log.error(e);
+      Plugin.init();
+      runCommand();
+    });
+  }
 };
 
 module.exports = cli;
@@ -6,7 +6,6 @@ var chalk = require('../chalk');
 var config = require('../config');
 var log = require('../log');
 var Plugin = require('../plugin');
-var Queue = require('../queue');
 var session = require('../session');
 
 const cmd = {
@@ -74,60 +73,45 @@ function print(plugins) {
   Plugin.save();
 }
 
-function install(plugins) {
-  function doTask(plugin, queue, cb) {
-    Plugin.install(plugin.name, function(e, p) {
-      if (!e) {
-        p.enable(plugin.enabled);
-        p.save();
-        p.help();
-      }
-      return cb(e);
-    });
-  }
-
-  const q = new Queue(plugins, {}, doTask);
-  q.run(1, function(e) {
-    if (e) return log.fail(e);
-    Plugin.init();
-    print();
-  });
-}
-
 cmd.handler = function(argv) {
   session.argv = argv;
 
   let plugins = Plugin.plugins;
   const name = argv.name;
 
   if (argv.install) {
+    const cb = function(e) {
+      if (e) return log.error(e);
+      Plugin.init();
+      print();
+    };
+
     if (name) {
-      install([new Plugin(-1, name, 'missing')]);
+      Plugin.install(name, cb);
     } else {
-      plugins = plugins.filter(x => x.missing);
-      install(plugins);
+      Plugin.installMissings(cb);
     }
     return;
   }
 
   if (name) plugins = plugins.filter(x => x.name === name);
   if (plugins.length === 0) return log.error('Plugin not found!');
 
-  const plugin = plugins[0];
-  if (plugin.missing && (argv.enable || argv.disable))
+  const p = plugins[0];
+  if (p.missing && (argv.enable || argv.disable))
     return log.error('Plugin missing, install it first');
 
   if (argv.enable) {
-    plugin.enable(true);
-    plugin.save();
+    p.enable(true);
+    p.save();
     print();
   } else if (argv.disable) {
-    plugin.enable(false);
-    plugin.save();
+    p.enable(false);
+    p.save();
     print();
   } else if (argv.delete) {
-    plugin.delete();
-    plugin.save();
+    p.delete();
+    p.save();
     Plugin.init();
     print();
   } else if (argv.config) {
 
@@ -10,6 +10,7 @@ var h = require('./helper');
 var cache = require('./cache');
 var config = require('./config');
 var log = require('./log');
+var Queue = require('./queue');
 
 function Plugin(id, name, ver, desc, deps) {
   this.id = id;
@@ -171,16 +172,36 @@ Plugin.copy = function(src, cb) {
 
 Plugin.install = function(name, cb) {
   Plugin.copy(name, function(e, fullpath) {
-    if (e) return log.error(e);
+    if (e) return cb(e);
     log.debug('copied to ' + fullpath);
 
-    const plugin = require(fullpath);
-    plugin.install(function() {
-      return cb(null, plugin);
+    const p = require(fullpath);
+    p.install(function() {
+      return cb(null, p);
     });
   });
 };
 
+Plugin.installMissings = function(cb) {
+  function doTask(plugin, queue, cb) {
+    Plugin.install(plugin.name, function(e, p) {
+      if (!e) {
+        p.enable(plugin.enabled);
+        p.save();
+        p.help();
+      }
+      return cb(e, p);
+    });
+  }
+
+  const plugins = Plugin.plugins.filter(x => x.missing);
+  if (plugins.length === 0) return cb();
+
+  log.warn('Installing missing plugins, might take a while ...');
+  const q = new Queue(plugins, {}, doTask);
+  q.run(1, cb);
+};
+
 Plugin.save = function() {
   for (let p of this.plugins) p.save();
 };