fixed script loading bug

Author: typhonrt

scripts/mocha-istanbul-report.js

@@ -28,6 +28,7 @@
 
 var cp =                require('child_process');
 var fs =                require('fs-extra');
+var path =              require('path');
 var stripJsonComments = require('strip-json-comments');
 
 var testEntry = 'test';
@@ -74,21 +75,22 @@ try
 {
    if (fs.statSync('./.npmscriptrc.js').isFile())
    {
-      configInfo = require('./.npmscriptrc.js');
+      configInfo = require(path.resolve('./.npmscriptrc.js'));
    }
 }
-catch (err) { /* nop */ }
-
-// Attempt to load `.npmscriptrc` and strip comments.
-/* istanbul ignore next */
-try
+catch (err)
 {
-   if (fs.statSync('./.npmscriptrc').isFile())
+   // Attempt to load `.npmscriptrc` and strip comments.
+   /* istanbul ignore next */
+   try
    {
-      configInfo = JSON.parse(stripJsonComments(fs.readFileSync('./.npmscriptrc', 'utf-8')));
+      if (fs.statSync('./.npmscriptrc').isFile())
+      {
+         configInfo = JSON.parse(stripJsonComments(fs.readFileSync('./.npmscriptrc', 'utf-8')));
+      }
    }
+   catch (err) { /* nop */ }
 }
-catch (err) { /* nop */ }
 
 // Exit now if no configInfo object has been loaded.
 if (typeof configInfo !== 'object')

scripts/mocha-istanbul.js

@@ -24,6 +24,7 @@
 
 var cp =                require('child_process');
 var fs =                require('fs-extra');
+var path =              require('path');
 var stripJsonComments = require('strip-json-comments');
 
 var testEntry = 'test';
@@ -70,21 +71,22 @@ try
 {
    if (fs.statSync('./.npmscriptrc.js').isFile())
    {
-      configInfo = require('./.npmscriptrc.js');
+      configInfo = require(path.resolve('./.npmscriptrc.js'));
    }
 }
-catch (err) { /* nop */ }
-
-// Attempt to load `.npmscriptrc` and strip comments.
-/* istanbul ignore next */
-try
+catch (err)
 {
-   if (fs.statSync('./.npmscriptrc').isFile())
+   // Attempt to load `.npmscriptrc` and strip comments.
+   /* istanbul ignore next */
+   try
    {
-      configInfo = JSON.parse(stripJsonComments(fs.readFileSync('./.npmscriptrc', 'utf-8')));
+      if (fs.statSync('./.npmscriptrc').isFile())
+      {
+         configInfo = JSON.parse(stripJsonComments(fs.readFileSync('./.npmscriptrc', 'utf-8')));
+      }
    }
+   catch (err) { /* nop */ }
 }
-catch (err) { /* nop */ }
 
 // Exit now if no configInfo object has been loaded.
 if (typeof configInfo !== 'object')

scripts/mocha.js

@@ -13,6 +13,7 @@
 
 var cp =                require('child_process');
 var fs =                require('fs');
+var path =              require('path');
 var stripJsonComments = require('strip-json-comments');
 
 var testEntry = 'test';
@@ -45,21 +46,22 @@ try
 {
    if (fs.statSync('./.npmscriptrc.js').isFile())
    {
-      configInfo = require('./.npmscriptrc.js');
+      configInfo = require(path.resolve('./.npmscriptrc.js'));
    }
 }
-catch (err) { /* nop */ }
-
-// Attempt to load `.npmscriptrc` and strip comments.
-/* istanbul ignore next */
-try
+catch (err)
 {
-   if (fs.statSync('./.npmscriptrc').isFile())
+   // Attempt to load `.npmscriptrc` and strip comments.
+   /* istanbul ignore next */
+   try
    {
-      configInfo = JSON.parse(stripJsonComments(fs.readFileSync('./.npmscriptrc', 'utf-8')));
+      if (fs.statSync('./.npmscriptrc').isFile())
+      {
+         configInfo = JSON.parse(stripJsonComments(fs.readFileSync('./.npmscriptrc', 'utf-8')));
+      }
    }
+   catch (err) { /* nop */ }
 }
-catch (err) { /* nop */ }
 
 // Exit now if no configInfo object has been loaded.
 if (typeof configInfo !== 'object')
@@ -113,4 +115,4 @@ exec += ' ' + testConfig.mocha.source;
 
 // Notify what command is being executed then execute it.
 process.stdout.write('Executing: ' + exec + '\n');
-cp.execSync(exec, { stdio: 'inherit' });
+cp.execSync(exec, { stdio: 'inherit' });