From 3a7b8909e26a7822b59a0417eed1cc841e0f74ae Mon Sep 17 00:00:00 2001
From: Shan <shanalikhan@hotmail.com>
Date: Fri, 7 Jun 2019 15:01:50 +0500
Subject: [PATCH] #668

---
 src/environmentPath.ts       |  4 +---
 src/service/pluginService.ts | 11 +++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/environmentPath.ts b/src/environmentPath.ts
index ca65f81d..888b3970 100644
--- a/src/environmentPath.ts
+++ b/src/environmentPath.ts
@@ -81,9 +81,7 @@ export class Environment {
         )[0].extensionPath,
         ".."
       ).concat(normalize("/")); // Gets first non-builtin extension's path
-    }
-
-    if (this.isPortable) {
+    } else {
       this.PATH = process.env.VSCODE_PORTABLE;
       this.USER_FOLDER = resolve(this.PATH, "user-data/User").concat(
         normalize("/")
diff --git a/src/service/pluginService.ts b/src/service/pluginService.ts
index 18e1dd56..f00c74f9 100644
--- a/src/service/pluginService.ts
+++ b/src/service/pluginService.ts
@@ -212,8 +212,8 @@ export class PluginService {
     notificationCallBack: (...data: any[]) => void
   ): Promise<ExtensionInformation[]> {
     let remainingExtensions: ExtensionInformation[] = [...missingExtensions];
-
-    notificationCallBack("TOTAL EXTENSIONS : " + missingExtensions.length);
+    const missingExtensionsCount = missingExtensions.length;
+    notificationCallBack("TOTAL EXTENSIONS : " + missingExtensionsCount);
     notificationCallBack("");
     notificationCallBack("");
     return Promise.all(
@@ -228,11 +228,10 @@ export class PluginService {
             remExt => remExt.name !== ext.name
           );
           notificationCallBack("");
+          notificationCallBack(`[x] - EXTENSION: ${ext.name} INSTALLED.`);
           notificationCallBack(
-            `EXTENSION: ${ext.name} INSTALLED. ${
-              remainingExtensions.length
-            } OF ${missingExtensions.length -
-              remainingExtensions.length} EXTENSIONS REMAINING`,
+            `      ${missingExtensions.length -
+              remainingExtensions.length} OF ${missingExtensionsCount} INSTALLED`,
             true
           );
           notificationCallBack("");