diff --git a/app.js b/app.js index a75048d5ee5e3010efe68c78859463f1e54a9f63..1e10f2b7265170db56568a775666a0ec48798387 100644 --- a/app.js +++ b/app.js @@ -112,7 +112,9 @@ if (frontendChecked){ const fileName = frontendChecked; const downloadURL = downloadFiles[frontendChecked]; -const frontendPullPromise = new Promise((resolve, reject) => { +function frontendPull(){ + +return new Promise((resolve, reject) => { console.log('resolve frontendPullPromise', resolve); exec('cd ' + fileName + ' git pull ', (error, stdout, stderr) => { @@ -126,7 +128,8 @@ const frontendPullPromise = new Promise((resolve, reject) => { resolve(); }); }) -promiseArray.push(frontendPullPromise); +} +promiseArray.push(frontendPull); console.log('promiseArray.push(frontendPullPromise):',promiseArray); @@ -158,8 +161,9 @@ console.log('promiseArray.push(frontendPullPromise):',promiseArray); // }) //promiseArray.push(frontendInstallAddons); //console.log('promiseArray.push(frontendInstallAddons):',promiseArray); +function frontendBuild(){ -const frontendBuildPromise = frontendPullPromise.then((resolve)=> { +return new Promise((resolve,reject)=> { console.log('resolve frontendBuildPromise', resolve); //build everything you have exec('cd ' + fileName +' && ember build --environment=production', (error, stdout, stderr) => { @@ -178,10 +182,19 @@ exec('cd ' + fileName +' && ember build --environment=production', (error, stdou }) -console.log('frontendBuildPromise:', frontendBuildPromise); -promiseArray.push(frontendBuildPromise); +} +//console.log('frontendBuildPromise:', frontendBuildPromise); +//promiseArray.push(frontendBuild()); console.log('promiseArray:',promiseArray); +function frontendAll() { + + return frontendPull().then(function(){ + return frontendBuild() + }) +} +promiseArray.push(frontendAll()); + }; @@ -204,6 +217,7 @@ console.log('in promise.all: promiseArray', promiseArray); }).on('data', function(data){ for (let i=0; i<data.length; i++) { const frontendStream = fs.createReadStream(data[i]); + console.log('frontend data[i]', data[i]); zip.file(data[i], frontendStream); }