JavaScriptExpert
diff --git a/‎apps/rush-lib/src/scripts/ci-rush.ts‎
Lines changed: 6 additions & 3 deletions b/‎apps/rush-lib/src/scripts/ci-rush.ts‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎common/changes/@microsoft/rush/ianc-minor-fix-to-ci-rush_2018-05-31-05-09.json‎
Lines changed: 11 additions & 0 deletions b/‎common/changes/@microsoft/rush/ianc-minor-fix-to-ci-rush_2018-05-31-05-09.json‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎common/scripts/ci-rush.js‎
Lines changed: 6 additions & 3 deletions b/‎common/scripts/ci-rush.js‎
Lines changed: 6 additions & 3 deletions
@@ -131,11 +131,14 @@ if (!installedVersionValid || installedVersion !== expectedVersion) {
       const resultLines: string[] = [];
       // Trim out lines that reference environment variables that aren't defined
       for (const line of npmrcFileLines) {
-        const environmentVariables: string[] | null = line.match(/\$\{([^\}]+)\}/g);
+        const regex: RegExp = /\$\{([^\}]+)\}/g; // This finds environment varible tokens that look like "${VAR_NAME}"
+        const environmentVariables: string[] | null = line.match(regex);
         let lineShouldBeTrimmed: boolean = false;
         if (environmentVariables) {
-          for (const environmentVariable of environmentVariables) {
-            if (!process.env[environmentVariable]) {
+          for (const token of environmentVariables) {
+            // Remove the leading "${" and the trailing "}" from the token
+            const environmentVariableName: string = token.substring(2, token.length - 1);
+            if (!process.env[environmentVariableName]) {
               lineShouldBeTrimmed = true;
               break;
             }
 
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "Minor fix to the ci-rush script.",
+      "packageName": "@microsoft/rush",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "iclanton@users.noreply.github.com"
+}