[tor-commits] [tor-browser-bundle/master] Use versions file itself to decide which locales to build.

[mikeperry at torproject.org]

commit 3618f8600080f675a4592c5a7667c349bb3364a2
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Feb 27 21:53:10 2014 -0800

    Use versions file itself to decide which locales to build.
---
 gitian/descriptors/linux/gitian-bundle.yml   |    6 +++---
 gitian/descriptors/windows/gitian-bundle.yml |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index 958fb65..36c2efc 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -134,11 +134,11 @@ script: |
   #
   unzip linux-langpacks.zip
   cd linux-langpacks
-  for i in *.xpi
+  for LANG in $BUNDLE_LOCALES
   do
-    LANG=`basename $i .xpi`
+    xpi=$LANG.xpi
     cp -a ../tor-browser ../tor-browser_$LANG
-    cp $i ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG at firefox.mozilla.org.xpi
+    cp $xpi ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG at firefox.mozilla.org.xpi
     cd ..
 
     # FF24 puts the prefs in a different jar:
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index f8e6d1b..8cf2f05 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -131,10 +131,10 @@ script: |
   #
   unzip ../win32-langpacks.zip
   cd win32-langpacks
-  for i in *.xpi
+  for LANG in $BUNDLE_LOCALES
   do
-    LANG=`basename $i .xpi`
-    cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG at firefox.mozilla.org.xpi
+    xpi=$LANG.xpi
+    cp $xpi ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG at firefox.mozilla.org.xpi
     cd ..
 
     # FF24 puts the prefs in a different jar: