From 409fbe3cf0ba86f755ca836cc626818021c79959 Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Fri, 27 Mar 2015 12:50:21 -0700
Subject: [PATCH] Fix problems with Gruntfile and local dependencies

---
 Gruntfile.coffee | 7 +++----
 scripts/deploy   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 074c664ec..d04516b10 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -43,7 +43,6 @@ module.exports = (grunt)->
 
         clean:
             dist: ['./dist']
-            deps: ['./node_modules/crafting-guide-common']
 
         copy:
             jquery_ui_images:
@@ -159,13 +158,13 @@ module.exports = (grunt)->
 
     grunt.registerTask 'build', [ 'rsync:non_html', 'copy', 'sass:build', 'jade', 'browserify', 'exorcise' ]
 
-    grunt.registerTask 'dist', ['test', 'clean:dist', 'build', 'rsync:static', 'sass:dist', 'uglify']
+    grunt.registerTask 'dist', ['test', 'clean', 'build', 'rsync:static', 'sass:dist', 'uglify']
 
-    grunt.registerTask 'clean-watch', ['clean:dist', 'build', 'watch']
+    grunt.registerTask 'clean-watch', ['clean', 'build', 'watch']
 
     grunt.registerTask 'use-local-deps', ->
         grunt.file.mkdir './node_modules'
-        grunt.file.delete './node_modules/crafting-guide-common'
+        grunt.file.delete './node_modules/crafting-guide-common', force:true
         fs.symlinkSync '../../crafting-guide-common/', './node_modules/crafting-guide-common'
 
     grunt.registerTask 'test', ['mochaTest']
diff --git a/scripts/deploy b/scripts/deploy
index 7b32ece9f..524052150 100755
--- a/scripts/deploy
+++ b/scripts/deploy
@@ -23,7 +23,7 @@ if [[ "$TARGET" == "new" ]]; then
     if grunt dist; then
         echo "Preparing to upload to S3..."
         s3cmd sync -r --delete-removed --add-header="cache-control:max-age=1800" "$ROOT/" "s3://new.$SITE/"
-        grunt clean build
+        grunt clean:dist build
     else
         echo "Aborting deployment"
     fi