fix where options are read and merged

Author: gsager

dashboard.tar.gz

@@ -129,16 +129,16 @@ init = function(host, port, contentPath, user, password, secure, wcmDir) {
             deferred.reject(libTitle + ' is not available check for correct server');
         else{
             Q.longStackSupport = true;
+            var totalCount = 0;
+            var libSettings = utils.getSettings(wcmCwd + libTitle + Path.sep);
+            options = utils.getMergerdOptions(options || {}, libSettings);
             createFolder(wcmCwd + libTitle);
             createFolder(wcmCwd + libTitle + Path.sep + 'Presentation Templates');
             createFolder(wcmCwd + libTitle + Path.sep + 'Components');
             // only do content template components if the user turns on trial code
             if(options.trial && options.trial == true)
                 createFolder(wcmCwd + libTitle + Path.sep + cAuthoringTemplates);
             progGoal++;
-            var totalCount = 0;
-            var libSettings = utils.getSettings(wcmCwd + libTitle + Path.sep);
-            options = utils.getMergerdOptions(options || {}, libSettings);
             eventEmitter.emit("pullingLib", libTitle);
             wcmRequests.getFolderMap(libTitle).then(function(map) {
                 var sVals = map.values().sort(compare);