chore: code style

Author: atian25

lib/cmd/start.js

@@ -71,15 +71,16 @@ class StartCommand extends Command {
   }
 
   * run(context) {
-    const argv = Object.assign({}, context.argv);
+    const { argv, env, cwd, execArgv } = context;
+
     const HOME = homedir();
     const logDir = path.join(HOME, 'logs');
 
     // egg-script start
     // egg-script start ./server
     // egg-script start /opt/app
-    let baseDir = argv._[0] || context.cwd;
-    if (!path.isAbsolute(baseDir)) baseDir = path.join(context.cwd, baseDir);
+    let baseDir = argv._[0] || cwd;
+    if (!path.isAbsolute(baseDir)) baseDir = path.join(cwd, baseDir);
     argv.baseDir = baseDir;
 
     const isDaemon = argv.daemon;
@@ -97,24 +98,18 @@ class StartCommand extends Command {
     argv.stdout = argv.stdout || path.join(logDir, 'master-stdout.log');
     argv.stderr = argv.stderr || path.join(logDir, 'master-stderr.log');
 
-    const env = context.env;
+    // normalize env
     env.HOME = HOME;
     env.NODE_ENV = 'production';
 
-    // adjust env for win
-    const currentPATH = env.PATH || env.Path;
-    // for nodeinstall
-    let newPATH = `${path.join(baseDir, 'node_modules/.bin')}${path.delimiter}`;
-    // support `${baseDir}/.node/bin`
-    const customNodeBinDir = path.join(baseDir, '.node/bin');
-    if (yield fs.exists(customNodeBinDir)) {
-      newPATH += `${customNodeBinDir}${path.delimiter}`;
-    }
-    if (currentPATH) {
-      env.PATH = `${newPATH}${currentPATH}`;
-    } else {
-      env.PATH = newPATH;
-    }
+    env.PATH = [
+      // for nodeinstall
+      path.join(baseDir, 'node_modules/.bin'),
+      // support `.node/bin`, due to npm5 will remove `node_modules/.bin`
+      path.join(baseDir, '.node/bin'),
+      // adjust env for win
+      env.PATH || env.Path,
+    ].filter(x => !!x).join(path.delimiter);
 
     // for alinode
     env.ENABLE_NODE_LOG = 'YES';
@@ -128,7 +123,7 @@ class StartCommand extends Command {
     }
 
     const options = {
-      execArgv: context.execArgv,
+      execArgv,
       env,
       stdio: 'inherit',
       detached: false,
@@ -151,6 +146,7 @@ class StartCommand extends Command {
       const child = this.child = spawn('node', eggArgs, options);
       this.isReady = false;
       child.on('message', msg => {
+        /* istanbul ignore else */
         if (msg && msg.action === 'egg-ready') {
           this.isReady = true;
           this.logger.info('%s started on %s', this.frameworkName, msg.data.address);
@@ -177,6 +173,7 @@ class StartCommand extends Command {
     let name = 'egg';
     try {
       const pkg = require(pkgPath);
+      /* istanbul ignore else */
       if (pkg.name) name = pkg.name;
     } catch (_) {
       /* istanbul next */