From c608ad4218247257aab307ff257db25433218634 Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Sun, 3 Apr 2016 20:59:57 -0700
Subject: [PATCH] Ensure upload task fails if upload fails

---
 Gruntfile.coffee  | 12 ++++++------
 scripts/s3_upload |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 4d84b4950..4fc27f30b 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -232,27 +232,27 @@ module.exports = (grunt)->
 
     grunt.registerTask 'script:deploy:prod', "deploy code by copying to the production branch", ->
       done = this.async()
-      grunt.util.spawn cmd:'./scripts/deploy', args:['--production'], opts:{stdio:'inherit'}, -> done()
+      grunt.util.spawn cmd:'./scripts/deploy', args:['--production'], opts:{stdio:'inherit'}, (error)-> done(error)
 
     grunt.registerTask 'script:deploy:staging', "deploy code by copying to the staging branch", ->
       done = this.async()
-      grunt.util.spawn cmd:'./scripts/deploy', args:['--staging'], opts:{stdio:'inherit'}, -> done()
+      grunt.util.spawn cmd:'./scripts/deploy', args:['--staging'], opts:{stdio:'inherit'}, (error)-> done(error)
 
     grunt.registerTask 'publish', 'publishes this package to NPM', ->
       done = this.async()
-      grunt.util.spawn cmd:'./scripts/publish', opts:{stdio:'inherit'}, -> done()
+      grunt.util.spawn cmd:'./scripts/publish', opts:{stdio:'inherit'}, (error)-> done(error)
 
     grunt.registerTask 'script:s3_upload:prod', 'uploads all static content to S3', ->
       done = this.async()
-      grunt.util.spawn cmd:'./scripts/s3_upload', args:['--prod'], opts:{stdio:'inherit'}, -> done()
+      grunt.util.spawn cmd:'./scripts/s3_upload', args:['--prod'], opts:{stdio:'inherit'}, (error)-> done(error)
 
     grunt.registerTask 'script:s3_upload:staging', 'uploads all static content to S3', ->
       done = this.async()
-      grunt.util.spawn cmd:'./scripts/s3_upload', args:['--staging'], opts:{stdio:'inherit'}, -> done()
+      grunt.util.spawn cmd:'./scripts/s3_upload', args:['--staging'], opts:{stdio:'inherit'}, (error)-> done(error)
 
     grunt.registerTask 'script:start', "start a local HTTP server on port 8080", ->
       done = this.async()
-      grunt.util.spawn cmd:'./scripts/start', opts:{stdio:'inherit'}, -> done()
+      grunt.util.spawn cmd:'./scripts/start', opts:{stdio:'inherit'}, (error)-> done(error)
 
     # Command-Line Argument Processing #################################################################################
 
diff --git a/scripts/s3_upload b/scripts/s3_upload
index 50a1c0083..6718899b0 100755
--- a/scripts/s3_upload
+++ b/scripts/s3_upload
@@ -28,7 +28,7 @@ cat $AWS_CONFIG_FILE | grep "aws_secret_access_key" | sed "s/aws_secret_access_k
 
 HEADERS="--add-header=cache-control:max-age=1800"
 GZIP="--add-header=content-encoding:gzip"
-CMD="sync $SOURCE_DIR $TARGET_DIR -r -P $HEADERS --exclude=*"
+CMD="sync $SOURCE_DIR $TARGET_DIR -r -P $HEADERS --stop-on-error --exclude=*"
 
 echo "Preparing to upload to S3..."
 s3cmd $CMD       -m 'image/png'                     --include="*.png"  || exit 1