Skip to content
Snippets Groups Projects
Commit c8cf6be2 authored by Josefine Wegert's avatar Josefine Wegert
Browse files

minor fix

parent 20d0f74e
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,6 @@ const downloadNames = Object.keys(downloadFiles);
//load functions for frontend and backend build
let backendFunctions = require('./backendFunctions.js');
let frontendFunctions = require('./frontendFunctions.js');
let zipFunctions = require('./zipFunctions.js');
var app = express();
......@@ -145,10 +144,11 @@ function streamFilesToZip(promiseArray){
console.log('in streamFilesToZip');
return new Promise((resolve,reject)=> {
let finishedArray=[];
console.log('promiseArray in streamFilesToZip before Promise.all:', promiseArray);
Promise.all(promiseArray).then(files => {
console.log('in Promise.all, files:', files);
let finishedArray=[];
files.forEach(file => {
if (file.zipFileName === 'backend.war'){
......@@ -182,10 +182,7 @@ function streamFilesToZip(promiseArray){
})
if(finishedArray.length === files.length){
console.log('before resolve() in backend.war');
resolve();
}
......@@ -201,10 +198,8 @@ function streamFilesToZip(promiseArray){
}
}).on('finish', function(){
finishedArray.push('frontend finished');
if(finishedArray.length === files.length){
resolve();
}
resolve(finishedArray.push('frontend finished'));
})
}
......@@ -214,7 +209,10 @@ function streamFilesToZip(promiseArray){
})
})
if(finishedArray.length === files.length){
console.log('before resolve() in streamFilesToZip');
resolve();
}
})
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment