[tor-commits] [tor-messenger-build/master] Create branding before applying the patches

[sukhbir at torproject.org]

commit e53475552105e92c67a3718341879555a9cbd25e
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Apr 15 07:11:10 2015 -0400

    Create branding before applying the patches
---
 projects/instantbird/build |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index d2dcee1..a999f32 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -32,15 +32,17 @@ cd moz
 tar xf ../[% c('input_files_by_name/mozilla-src') %]
 mv mozilla-* ../[% project %]-[% c('version') %]/mozilla
 cd ../[% project %]-[% c('version') %]
+
+mkdir im/branding/messenger
+cp -R im/branding/nightly/* im/branding/messenger/
+
+cd mozilla
 for patch in $(ls -1 ../*.patch | sort)
 do
   patch -p1 < $patch
 done
 cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 cp ../cert_override.txt im/app/profile
-mkdir im/branding/messenger
-cp -R im/branding/nightly/* im/branding/messenger/
-cd mozilla
 if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1
 then
     for patch in $(ls -1 $rootdir/*.mozpatch | sort)