Merge pull request #20 from xgeek-net/fix/gitdeploy

Fix deploy error from git.
xgeek-net · Jun 20, 2019 · f0ba353 · f0ba353
2 parents 5566690 + cf7fafb
commit f0ba353
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
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.1",
+  "version": "2.0.2",
   "private": false,
   "main": "src/main.js",
   "dependencies": {

diff --git a/src/class/GitApi.js b/src/class/GitApi.js
@@ -355,11 +355,16 @@ class GitApi {
         NodeGit.Reset.reset(repos, commit, 3, {});
       })
       .then(function (success) {
-        // Copy metadata from git folder to metadata folder
+        // Copy metadata src folder from git into metadata folder
         let gitPath = self.getGitFolder(path.join('pipeline', self.pipeline.id));
         const rootDir = self.pipeline.path;
         if(rootDir) gitPath = path.join(gitPath, rootDir);
+        gitPath = path.join(gitPath, 'src');
+        if(!fse.pathExistsSync(gitPath)) {
+          return reject(new Error('src folder is not found.'));
+        }
         let metaPath = metadata.getMetadataFolder(self.pipeline.id);
+        metaPath = path.join(metaPath, 'src');
         fse.copy(gitPath, metaPath, function(err){
           if (err) return reject(err);
           return resolve(success);