Small cleanup in build/linux/install-arm-sysroot.py.

build/linux/install-arm-sysroot.py

Index: build/linux/install-arm-sysroot.py
===================================================================
--- build/linux/install-arm-sysroot.py	(revision 198186)
+++ build/linux/install-arm-sysroot.py	(working copy)
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# Script to install arm choot image for cross building of arm chrome on linux.
+# Script to install ARM chroot image for cross building of ARM chrome on linux.

[Sam Clegg, 2013/05/04 05:15:58]

nit: I think "root image" is actually more accurate.

One can certain chroot into a rootfs image, but one can also
do other things like boot into it, or use it as a sysroot
when compiling.  For this particular use case we are not
chrooting into it.

I think "rootfs", "root image" or "sysroot" is better.

[Lei Zhang, 2013/05/07 03:34:27]

root image it is.

 # This script can be run manually but is more often run as part of gclient
 # hooks. When run from hooks this script should be a no-op on non-linux
 # platforms.
@@ -24,6 +24,7 @@
 URL_PREFIX = 'https://commondatastorage.googleapis.com'
 URL_PATH = 'nativeclient-archive2/toolchain'
 REVISION = 10991
+TARBALL = 'naclsdk_linux_arm-trusted.tgz'
 
 
 def main(args):
@@ -39,8 +40,7 @@
 
   src_root = os.path.dirname(os.path.dirname(SCRIPT_DIR))
   sysroot = os.path.join(src_root, 'arm-sysroot')
-  url = "%s/%s/%s/naclsdk_linux_arm-trusted.tgz" % (URL_PREFIX,
-                                                    URL_PATH, REVISION)
+  url = "%s/%s/%s/%s" % (URL_PREFIX, URL_PATH, REVISION, TARBALL)
 
   stamp = os.path.join(sysroot, ".stamp")
   if os.path.exists(stamp):
@@ -53,7 +53,7 @@
   if os.path.isdir(sysroot):
     shutil.rmtree(sysroot)
   os.mkdir(sysroot)
-  tarball = os.path.join(sysroot, 'naclsdk_linux_arm-trusted.tgz')
+  tarball = os.path.join(sysroot, TARBALL)
   subprocess.check_call(['curl', '-L', url, '-o', tarball])
   subprocess.check_call(['tar', 'xf', tarball, '-C', sysroot])
   os.remove(tarball)