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

minor changes

parent e854c7e7
No related branches found
No related tags found
No related merge requests found
...@@ -135,7 +135,6 @@ function finalizeZip(){ ...@@ -135,7 +135,6 @@ function finalizeZip(){
} }
function createZip(zip){ function createZip(zip){
console.log('in createZip');
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
zip.generateNodeStream({type:'nodebuffer',streamFiles:true}).pipe(fs.createWriteStream('explorviz-builds.zip')).on('error', function(error){ zip.generateNodeStream({type:'nodebuffer',streamFiles:true}).pipe(fs.createWriteStream('explorviz-builds.zip')).on('error', function(error){
console.log('error in createZip:', error); console.log('error in createZip:', error);
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
function frontendClean(fileName){ function frontendClean(fileName){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
//' git fetch origin && git reset --hard origin/master '
exec('cd ' + fileName + ' && git checkout package.json && npm prune ', (error, stdout, stderr) => { exec('cd ' + fileName + ' && git checkout package.json && npm prune ', (error, stdout, stderr) => {
if (error) { if (error) {
...@@ -49,8 +48,8 @@ ...@@ -49,8 +48,8 @@
if(checkedPlugins.length !== 0 ){ if(checkedPlugins.length !== 0 ){
checkedPlugins.forEach((pluginName) => { checkedPlugins.forEach((pluginName) => {
//TODO now addon is listed under dependencies-section in package.json
exec('cd ' + fileName + ' && ember install ' + downloadFiles[pluginName] + ' --save', (error, stdout, stderr) => { exec('cd ' + fileName + ' && ember install ' + downloadFiles[pluginName] + ' --save', (error, stdout, stderr) => {
console.log('in frontendInstallAddons');
if (error) { if (error) {
reject(error); reject(error);
......
...@@ -19,7 +19,6 @@ function initBackend(downloadFiles){ ...@@ -19,7 +19,6 @@ function initBackend(downloadFiles){
exec('git clone ' + downloadBackendURL + ' '+ backendName, (error, stdout, stderr) => { exec('git clone ' + downloadBackendURL + ' '+ backendName, (error, stdout, stderr) => {
if (error) { if (error) {
console.log('initGitRepos: backendFailed ->', error);
reject(error); reject(error);
return; return;
} }
...@@ -77,7 +76,6 @@ function initFrontend(downloadFiles){ ...@@ -77,7 +76,6 @@ function initFrontend(downloadFiles){
exec('git clone ' + downloadFrontendURL + ' ' + frontendName + ' && cd '+ frontendName + ' && npm install', (error, stdout, stderr) => { exec('git clone ' + downloadFrontendURL + ' ' + frontendName + ' && cd '+ frontendName + ' && npm install', (error, stdout, stderr) => {
if (error) { if (error) {
console.log('initGitRepos: frontendFailed ->', error);
reject(error); reject(error);
return; return;
} }
......
...@@ -36,8 +36,6 @@ function streamFilesToZip(promiseArray){ ...@@ -36,8 +36,6 @@ function streamFilesToZip(promiseArray){
resolve(); resolve();
}) })
} }
console.log('in backend.war');
backendContent = fs.readFileAsync(file.path); backendContent = fs.readFileAsync(file.path);
backendContent.then(function(data){ backendContent.then(function(data){
addBackendToZip(data).then(function(){ addBackendToZip(data).then(function(){
...@@ -60,26 +58,16 @@ function streamFilesToZip(promiseArray){ ...@@ -60,26 +58,16 @@ function streamFilesToZip(promiseArray){
const frontendReadStream = fs.createReadStream(data[i]); const frontendReadStream = fs.createReadStream(data[i]);
zip.file(data[i], frontendReadStream); zip.file(data[i], frontendReadStream);
} }
}).on('finish', function(){ }).on('finish', function(){
finishedArray.push('frontend finished'); finishedArray.push('frontend finished');
if(finishedArray.length === promiseArray.length){ if(finishedArray.length === promiseArray.length){
resolve(zip); resolve(zip);
} }
console.log('finishedArray in frontend:', finishedArray);
}) })
} }
}) })
}) })
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment