Merge 5cf6e5f into 6faa677

xgeek-net · Jun 20, 2019 · 70c2156 · 70c2156
2 parents 6faa677 + 5cf6e5f
commit 70c2156
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ install:
 script:
   - NODE_ENV=test npm run coveralls
 after_success:
-  - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+  - cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage
 before_deploy:
   - brew update
   - brew install bower

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pipeline",
   "description": "Be less busy, less mistake in Salesforce metadata deploy",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": false,
   "main": "src/main.js",
   "dependencies": {
@@ -64,6 +64,7 @@
   "devDependencies": {
     "app-builder-lib": "^20.43.0",
     "chai": "^4.2.0",
+    "coveralls": "^3.0.4",
     "electron": "3.1.9",
     "electron-builder": "^20.43.0",
     "electron-builder-squirrel-windows": "^20.43.0",

diff --git a/src/class/Metadata.js b/src/class/Metadata.js
@@ -71,7 +71,9 @@ class Metadata {
     const pipelinePath = path.join(userDataPath, 'pipeline', pid, 'metadata');
     const filePath = path.join(pipelinePath, filename);
     const filePathWithoutName = path.dirname(filePath);
-    fse.ensureDirSync(filePathWithoutName, '0777');
+    if(!fse.pathExistsSync(filePathWithoutName)) {
+      fse.ensureDirSync(filePathWithoutName, '0777');
+    }
     return filePath
   }
 

diff --git a/src/class/SfdcApi.js b/src/class/SfdcApi.js
@@ -651,7 +651,9 @@ class SfdcApi {
     });
     unzipper.on('extract', function (log) {
       // console.log('[SFDC]Finished extracting' + log);
-      fse.ensureDirSync(sourceZipPath, '0777');
+      if(fse.pathExistsSync(sourceZipPath)) {
+        fse.removeSync(sourceZipPath);
+      }
       return callback(null, true);
     });
     unzipper.extract({