[Issue #38] - Throws exception if app directory does not exist...

Author: DrewImm

CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Fixes
 
+- [Issue #38] - Throws exception if app directory does not exist or is empty
+
 ## [0.3.0] - 2018-03-30
 
 ### Additions

lib/chainlinks/builder.js

@@ -58,14 +58,20 @@ let Builder = function() {
             }
 
             // Check for an app directory to merge
+            this._mergeCmd = false;
             if (this.dirMerge && this.dirMerge.length &&
                 fs.existsSync(this.dirMerge)) {
 
                 // Create app directory path
                 let mergePath = path.normalize(this.dirMerge);
+
+                // Check directory contents
+                if (fs.readdirSync(mergePath).length) {
 
-                // Merge the directory
-                this._mergeCmd = "cp -rf ../" + mergePath + "/* .";
+                    // Merge the directory
+                    this._mergeCmd = "cp -rf ../" + mergePath + "/* .";
+
+                }
 
             }
 
@@ -75,28 +81,25 @@ let Builder = function() {
                 // Install
                 if (
                     this.binCmd(this.installCmd) &&
-                    this.binCmd(this.cleanupCmd) &&
-                    (this._mergeCmd && this.binCmd(this._mergeCmd)))
+                    this.binCmd(this.cleanupCmd))
                 {
-        
-                    accept(payload);
 
                 }
                 else {
                     reject("Could not install");
                 }
 
             }
-            else {
 
-                // Merge build
-                if (this._mergeCmd && this.binCmd(this._mergeCmd)) {
-                    accept(payload);
-                }
-                else {
-                    reject("Could not merge");
-                }
+            // Merge build
+            if (this._mergeCmd && this.binCmd(this._mergeCmd)) {
+
             }
+            else if (this._mergeCmd) {
+                reject("Could not merge");
+            }
+        
+            accept(payload);
 
         });
     }