Merge remote-tracking branch 'nzherald_github/allow-pull-requests-to-run-travis-tests' into rails-3-develop

1 files changed, 3 insertions, 1 deletions

diff --git a/script/wad b/script/wad
index 658ce37ef..98830e4a2 100755
--- a/script/wad
+++ b/script/wad
@@ -330,6 +330,8 @@ class Wad
   end
 
   def s3_configure
+    return log "ENV['S3_CREDENTIALS'] not present." unless ENV['S3_CREDENTIALS']
+
     Presss.config = {
       :region => s3_region,
       :bucket_name => s3_bucket_name,
@@ -424,7 +426,7 @@ class Wad
   end
 
   def self.setup
-    new.setup
+    ENV['S3_CREDENTIALS'] ? new.setup : new.install_bundle
   end
 end