diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-03-30 16:00:02 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-30 16:00:02 +0100 |
| commit | f24cc98afa25ad6010ae5316eecc15dfdb3fa79b (patch) | |
| tree | c32fecb16bb2097da7dfdf90e6915fce0bf1a425 /script/wad | |
| parent | 823e58dc69960c600230b10604a0051359173f85 (diff) | |
| parent | 3c0604cf900ad274d8f6ff421d39854ccbf4b6af (diff) | |
Merge branch 'release/0.21'0.21.0.0
Conflicts:
locale/cy/app.po
locale/es_NI/app.po
locale/hr/app.po
locale/is_IS/app.po
locale/sr@latin/app.po
Diffstat (limited to 'script/wad')
| -rwxr-xr-x | script/wad | 4 |
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 |