From a6832ac3c7727293a34b8f6bfb1f8b33addcdb0f Mon Sep 17 00:00:00 2001
From: Andrei Achim <monojack.io@gmail.com>
Date: Tue, 20 Sep 2016 18:04:08 +0300
Subject: [PATCH] refactor(init): run `link-cli` before `npm-install`

---
 packages/angular-cli/commands/init.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/angular-cli/commands/init.ts b/packages/angular-cli/commands/init.ts
index f8f082214c76..ceb36804ad22 100644
--- a/packages/angular-cli/commands/init.ts
+++ b/packages/angular-cli/commands/init.ts
@@ -57,18 +57,18 @@ const InitCommand: any = Command.extend({
       });
     }
 
-    let npmInstall: any;
-    if (!commandOptions.skipNpm) {
-      npmInstall = new NpmInstall({
+    let linkCli: any;
+    if (commandOptions.linkCli) {
+      linkCli = new LinkCli({
         ui: this.ui,
         analytics: this.analytics,
         project: this.project
       });
     }
 
-    let linkCli: any;
-    if (commandOptions.linkCli) {
-      linkCli = new LinkCli({
+    let npmInstall: any;
+    if (!commandOptions.skipNpm) {
+      npmInstall = new NpmInstall({
         ui: this.ui,
         analytics: this.analytics,
         project: this.project
@@ -121,13 +121,13 @@ const InitCommand: any = Command.extend({
         }
       }.bind(this))
       .then(function () {
-        if (!commandOptions.skipNpm) {
-          return npmInstall.run();
+        if (commandOptions.linkCli) {
+          return linkCli.run();
         }
       })
       .then(function () {
-        if (commandOptions.linkCli) {
-          return linkCli.run();
+        if (!commandOptions.skipNpm) {
+          return npmInstall.run();
         }
       })
       .then(function () {