Commit 96e49f3b authored by derat's avatar derat Committed by Commit bot

Update version of fonts for install-chromeos-fonts.py.

This script was installing an ancient version of the Noto
fonts; update it to use 20140815 instead.

BUG=none

Review URL: https://codereview.chromium.org/666413002

Cr-Commit-Position: refs/heads/master@{#300692}
parent a2226a6c
...@@ -12,16 +12,12 @@ import shutil ...@@ -12,16 +12,12 @@ import shutil
import subprocess import subprocess
import sys import sys
URL_PREFIX = 'https://commondatastorage.googleapis.com' # Taken from the media-fonts/notofonts ebuild in chromiumos-overlay.
URL_DIR = 'chromeos-localmirror/distfiles' VERSION = '20140815'
URL_FILE = 'notofonts-20121206.tar.gz' URL = ('https://commondatastorage.googleapis.com/chromeos-localmirror/'
'distfiles/notofonts-%s.tar.bz2') % (VERSION)
FONTS_DIR = '/usr/local/share/fonts' FONTS_DIR = '/usr/local/share/fonts'
# The URL matches the URL in the ebuild script in chromiumos. See:
# /path/to/chromiumos/src/
# third_party/chromiumos-overlay/media-fonts/notofonts/
# notofonts-20121206.ebuild
def main(args): def main(args):
if not sys.platform.startswith('linux'): if not sys.platform.startswith('linux'):
print "Error: %s must be run on Linux." % __file__ print "Error: %s must be run on Linux." % __file__
...@@ -37,12 +33,10 @@ def main(args): ...@@ -37,12 +33,10 @@ def main(args):
dest_dir = os.path.join(FONTS_DIR, 'chromeos') dest_dir = os.path.join(FONTS_DIR, 'chromeos')
url = "%s/%s/%s" % (URL_PREFIX, URL_DIR, URL_FILE)
stamp = os.path.join(dest_dir, ".stamp02") stamp = os.path.join(dest_dir, ".stamp02")
if os.path.exists(stamp): if os.path.exists(stamp):
with open(stamp) as s: with open(stamp) as s:
if s.read() == url: if s.read() == URL:
print "Chrome OS fonts already up-to-date in %s." % dest_dir print "Chrome OS fonts already up-to-date in %s." % dest_dir
return 0 return 0
...@@ -52,8 +46,8 @@ def main(args): ...@@ -52,8 +46,8 @@ def main(args):
os.chmod(dest_dir, 0755) os.chmod(dest_dir, 0755)
print "Installing Chrome OS fonts to %s." % dest_dir print "Installing Chrome OS fonts to %s." % dest_dir
tarball = os.path.join(dest_dir, URL_FILE) tarball = os.path.join(dest_dir, os.path.basename(URL))
subprocess.check_call(['curl', '-L', url, '-o', tarball]) subprocess.check_call(['curl', '-L', URL, '-o', tarball])
subprocess.check_call(['tar', '--no-same-owner', '--no-same-permissions', subprocess.check_call(['tar', '--no-same-owner', '--no-same-permissions',
'-xf', tarball, '-C', dest_dir]) '-xf', tarball, '-C', dest_dir])
os.remove(tarball) os.remove(tarball)
...@@ -65,7 +59,7 @@ def main(args): ...@@ -65,7 +59,7 @@ def main(args):
s.write("Script: %s\n" % __file__) s.write("Script: %s\n" % __file__)
with open(stamp, 'w') as s: with open(stamp, 'w') as s:
s.write(url) s.write(URL)
for base, dirs, files in os.walk(dest_dir): for base, dirs, files in os.walk(dest_dir):
for dir in dirs: for dir in dirs:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment