Issue 2744 - Install correct version of JS shell for 64bit Linux

utils.py

 # coding: utf-8
 
 # This Source Code is subject to the terms of the Mozilla Public License
 # version 2.0 (the "License"). You can obtain a copy of the License at
 # http://mozilla.org/MPL/2.0/.
 
-import os, platform, sys, urllib, zipfile

[Wladimir Palant, 2015/07/02 17:48:31]

Feel free to convert this to one per line while at it.

[kzar, 2015/07/03 13:08:50]

Done.

+import os
+import platform
 from StringIO import StringIO
+import sys
+import urllib
+import zipfile
 
 def ensureJSShell():
   baseDir = os.path.dirname(__file__)
   shell_dir = os.path.join(baseDir, 'mozilla')
   if not os.path.exists(shell_dir):
     os.makedirs(shell_dir)
   if sys.platform == 'win32':
     path = os.path.join(shell_dir, 'js.exe')
   else:
     path = os.path.join(shell_dir, 'js')
   if os.path.exists(path):
     return path
 
   supported_platforms = {
     'win32': 'win32',
     'linux2': {

[Sebastian Noack, 2015/07/03 14:31:44]

How about following?

supported_platforms = {
  ...
  'linux2': 'linux-%(arch)s'
  ...
}
...

build = supported_platforms[sys.platform] % {arch: platform.machine()}

[kzar, 2015/07/03 14:37:22]

I did consider doing something like that but I think it's better to explicitly
define the supported architectures. There aren't any other Linux builds of JS
shell available. 

[Sebastian Noack, 2015/07/03 14:41:34]

This is a good point. However, I don't like introducing a special case here, but
don't have a better idea right now. So LGTM.

-      '32bit': 'linux-i686',
-      '64bit': 'linux-x86_64'
+      'i686': 'linux-i686',
+      'x86_64': 'linux-x86_64'
     },
     'darwin': 'mac',
   }
   try:
     build = supported_platforms[sys.platform]
     if isinstance(build, dict):
-      build = build[platform.architecture()[0]]

[Wladimir Palant, 2015/07/02 17:48:31]

This will give you the architecture of the Python binary, not necessarily the
platform architecture. I guess that you need to use platform.machine().

[kzar, 2015/07/03 13:08:50]

Done.

+      build = build[platform.machine()]
   except KeyError:
     raise Exception('Platform %s (%s) not supported by JS shell' % (
-      sys.platform, platform.architecture()[0]
+      sys.platform, platform.machine()
     ))
 
   download_url = 'https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2015/02/2015-02-25-00-22-19-mozilla-esr31/jsshell-%s.zip' % build
   data = StringIO(urllib.urlopen(download_url).read())
   zip = zipfile.ZipFile(data)
   zip.extractall(shell_dir)
   zip.close()
 
   if not os.path.exists(path):
     raise Exception('Downloaded package didn\'t contain JS shell executable')
 
   try:
     os.chmod(path, 0700)
   except:
     pass
 
   return path