Minor tweaks to ci-rush.

iclanton · iclanton · commit 55b03eb109d7 · 2018-05-28T23:58:22.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,14 @@ script:
   - set -e
   - echo 'Checking change file...' && echo -en 'travis_fold:start:check\\r'
   - git fetch origin master:refs/remotes/origin/master -a
-  - node common/temp/local-rush/node_modules/@microsoft/rush/lib/start.js change -v
+  - node common/temp/ci-rush/node_modules/@microsoft/rush/lib/start.js change -v
   - echo -en 'travis_fold:end:check\\r'
   - echo 'Installing...' && echo -en 'travis_fold:start:install\\r'
-  - node common/temp/local-rush/node_modules/@microsoft/rush/lib/start.js install --bypass-policy
+  - node common/temp/ci-rush/node_modules/@microsoft/rush/lib/start.js install --bypass-policy
   - echo -en 'travis_fold:end:install\\r'
   - echo 'Running rush check' && echo -en 'travis_fold:start:check\\r'
-  - node common/temp/local-rush/node_modules/@microsoft/rush/lib/start.js check
+  - node common/temp/ci-rush/node_modules/@microsoft/rush/lib/start.js check
   - echo -en 'travis_fold:end:check\\r'
   - echo 'Building...' && echo -en 'travis_fold:start:build\\r'
-  - node common/temp/local-rush/node_modules/@microsoft/rush/lib/start.js rebuild --verbose --production
+  - node common/temp/ci-rush/node_modules/@microsoft/rush/lib/start.js rebuild --verbose --production
   - echo -en 'travis_fold:end:build\\r'
diff --git a/apps/rush-lib/src/scripts/ci-rush.ts b/apps/rush-lib/src/scripts/ci-rush.ts
@@ -75,7 +75,7 @@ if (!fs.existsSync(npmPath)) {
   process.exit(1);
 }
 
-const rushPathParts: string[] = ['common', 'temp', 'local-rush'];
+const rushPathParts: string[] = ['common', 'temp', 'ci-rush'];
 let rushPath: string = rushJsonDirectory;
 for (const rushPathPart of rushPathParts) {
   rushPath = path.join(rushPath, rushPathPart);
@@ -126,7 +126,8 @@ if (!installedVersionValid || installedVersion !== expectedVersion) {
   const rushNpmrcPath: string = path.join(rushPath, '.npmrc');
   if (fs.existsSync(npmrcPath)) {
     try {
-      const npmrcFileLines: string[] = fs.readFileSync(npmrcPath).toString().split('\n').map((line) => line.trim());
+      let npmrcFileLines: string[] = fs.readFileSync(npmrcPath).toString().split('\n');
+      npmrcFileLines = npmrcFileLines.map((line) => (line || '').trim());
       const resultLines: string[] = [];
       // Trim out lines that reference environment variables that aren't defined
       for (const line of npmrcFileLines) {
@@ -154,7 +155,7 @@ if (!installedVersionValid || installedVersion !== expectedVersion) {
   }
 
   const packageContents: IPackageJson = {
-    'name': 'local-rush',
+    'name': 'ci-rush',
     'version': '0.0.0',
     'dependencies': {
       [PACKAGE_NAME]: expectedVersion
diff --git a/common/scripts/ci-rush.js b/common/scripts/ci-rush.js
