Skip to content

Commit 2f74d59

Browse files
author
Gediminas
authored
Merge pull request #38 from danbovey/master
Fixed results folder not being changed by options
2 parents 6ed41e1 + 8cae660 commit 2f74d59

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

gulpfile.js

+6-7
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ var gulp = require('gulp'),
1010
logFile = '/speedtest.txt',
1111
siteURL = settings.siteURL,
1212
sitePages = settings.sitePages,
13-
resultsFolder = settings.resultsFolder,
1413
sitePagesUrls = [],
1514
htmlTestResults = [],
1615
folders = ['/content', '/content/images', '/content/styles'],
@@ -158,13 +157,13 @@ function htmltest() {
158157
};
159158

160159
function copyResultsToResultsFolder() {
161-
if (!fs.existsSync(resultsFolder)) { fs.mkdirSync(resultsFolder); }
160+
if (!fs.existsSync(settings.resultsFolder)) { fs.mkdirSync(settings.resultsFolder); }
162161
folders.forEach(function(folder, index, array){
163-
if (!fs.existsSync(resultsFolder+folder)) { fs.mkdirSync(resultsFolder+folder); }
162+
if (!fs.existsSync(settings.resultsFolder+folder)) { fs.mkdirSync(settings.resultsFolder+folder); }
164163
});
165164
htmlFiles.forEach(function(file, index, array){
166-
if (fs.existsSync(file)) { fs.unlinkSync(resultsFolder+file); }
167-
fs.writeFileSync(resultsFolder+file, fs.readFileSync(prefix+file));
165+
if (fs.existsSync(file)) { fs.unlinkSync(settings.resultsFolder+file); }
166+
fs.writeFileSync(settings.resultsFolder+file, fs.readFileSync(prefix+file));
168167
});
169168
}
170169

@@ -182,8 +181,8 @@ function performance(options) {
182181
siteURL = settings.siteURL;
183182
sitePages = settings.sitePages;
184183
copyResultsToResultsFolder();
185-
logFile = resultsFolder+'/speedtest.txt';
186-
fs.writeFile(resultsFolder+'/settings.txt', JSON.stringify(settings), function (err) {if (err) console.log(err);});
184+
logFile = settings.resultsFolder+'/speedtest.txt';
185+
fs.writeFile(settings.resultsFolder+'/settings.txt', JSON.stringify(settings), function (err) {if (err) console.log(err);});
187186
if (settings.runDevPerf) {
188187
GruntTasks(grunt);
189188
grunt.task.run('customdevperf');

0 commit comments

Comments
 (0)