From 588d785edf4bcb61fe4e57c952cb60ab2e3287a7 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Mon, 13 Apr 2015 12:04:23 -0400
Subject: [PATCH] More name consolidation #2101

---
 tasks/config/project/install.js | 12 +++---------
 tasks/install.js                | 12 ++++++------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js
index fc1fa15e2..e8c4a1547 100644
--- a/tasks/config/project/install.js
+++ b/tasks/config/project/install.js
@@ -730,26 +730,20 @@ module.exports = {
     /* Copy Install Folders */
     wrench: {
 
-      // copy during npm update (default theme / definition)
-      update: {
+      // overwrite existing files update & install (default theme / definition)
+      overwrite: {
         forceDelete       : true,
         excludeHiddenUnix : true,
         preserveFiles     : false
       },
 
-      // only create files that don't exist (site theme)
+      // only create files that don't exist (site theme update)
       merge: {
         forceDelete       : false,
         excludeHiddenUnix : true,
         preserveFiles     : true
       }
 
-      // copy during first npm install
-      install: {
-        forceDelete       : true,
-        excludeHiddenUnix : true,
-        preserveFiles     : false
-      },
     }
   }
 
diff --git a/tasks/install.js b/tasks/install.js
index 31b3f6646..d7da7fc99 100644
--- a/tasks/install.js
+++ b/tasks/install.js
@@ -104,13 +104,13 @@ module.exports = function () {
         console.log('Updating Semantic UI from ' + currentConfig.version + ' to ' + release.version);
 
         console.info('Updating ui definitions...');
-        wrench.copyDirSyncRecursive(source.definitions, updatePaths.definition, settings.wrench.update);
+        wrench.copyDirSyncRecursive(source.definitions, updatePaths.definition, settings.wrench.overwrite);
 
         console.info('Updating default theme...');
-        wrench.copyDirSyncRecursive(source.themes, updatePaths.theme, settings.wrench.update);
+        wrench.copyDirSyncRecursive(source.themes, updatePaths.theme, settings.wrench.overwrite);
 
         console.info('Updating tasks...');
-        wrench.copyDirSyncRecursive(source.tasks, updatePaths.tasks, settings.wrench.update);
+        wrench.copyDirSyncRecursive(source.tasks, updatePaths.tasks, settings.wrench.overwrite);
 
         console.info('Updating gulpfile.js');
         gulp.src(source.userGulpFile)
@@ -268,11 +268,11 @@ module.exports = function () {
         console.log('Installing to \033[92m' + answers.semanticRoot + '\033[0m');
 
         console.info('Copying UI definitions');
-        wrench.copyDirSyncRecursive(source.definitions, installPaths.definition, settings.wrench.install);
-        wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.install);
+        wrench.copyDirSyncRecursive(source.definitions, installPaths.definition, settings.wrench.overwrite);
+        wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.overwrite);
 
         console.info('Copying gulp tasks');
-        wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.install);
+        wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.overwrite);
 
         // copy theme import
         console.info('Adding theme files');