From 242f1e80a7232ec6b8d9f2773eb18cbbbf2b41fb Mon Sep 17 00:00:00 2001 From: lilia Date: Fri, 15 May 2015 13:13:32 -0700 Subject: [PATCH] Fix image corruption in /dist --- Gruntfile.js | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 15139a8c..6ffd67d8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -127,21 +127,30 @@ module.exports = function(grunt) { 'protos/*', 'js/**', 'stylesheets/*.css', + '!js/register.js' + ], + res: [ 'images/**', 'fonts/*', - '!js/register.js' ] }, copy: { - dist: { + res: { + files: [{ expand: true, dest: 'dist/', src: ['<%= dist.res %>'] }], + }, + src: { files: [{ expand: true, dest: 'dist/', src: ['<%= dist.src %>'] }], options: { process: function(content, srcpath) { - return content.replace( - /textsecure-service-staging.whispersystems.org/g, - 'textsecure-service.whispersystems.org').replace( - /whispersystems-textsecure-attachments-staging.s3.amazonaws.com/g, - 'whispersystems-textsecure-attachments.s3.amazonaws.com'); + if (srcpath.match('libtextsecure')) { + return content.replace( + /textsecure-service-staging.whispersystems.org/g, + 'textsecure-service.whispersystems.org').replace( + /whispersystems-textsecure-attachments-staging.s3.amazonaws.com/g, + 'whispersystems-textsecure-attachments.s3.amazonaws.com'); + } else { + return content; + } } } } @@ -165,7 +174,7 @@ module.exports = function(grunt) { tasks: ['concat:libtextsecure'] }, dist: { - files: ['<%= dist.src %>'], + files: ['<%= dist.src %>', '<%= dist.res %>'], tasks: ['copy'] }, },