From b26115f8dfb584a6fd773d72a3b80c9420972f92 Mon Sep 17 00:00:00 2001 From: Bruce Dawson Date: Mon, 21 Mar 2022 19:57:34 +0000 Subject: [PATCH] Fix Linux font install for Python 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit install-chromeos-fonts.py references python, which is not guaranteed to be installed (at least not on Googler machines). Instead, python2 and python3 are guaranteed available (in depot_tools if not elsewhere). This leads to this error message: Installing Chrome OS fonts. /usr/bin/env: ‘python’: No such file or directory ERROR: The installation of the Chrome OS default fonts failed. The remainder of the error message is misleading (in this context) and has a spelling error which this also fixes. Change-Id: Ie05a95d654a51448240f3910dd4bb54a32f54336 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3539216 Reviewed-by: Thomas Anderson Commit-Queue: Bruce Dawson Cr-Commit-Position: refs/heads/main@{#983457} --- build/install-build-deps.sh | 2 +- build/linux/install-chromeos-fonts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 1ec4e55473d098..00bf8b4bf69876 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -736,7 +736,7 @@ if [ "$do_inst_chromeos_fonts" != "0" ]; then echo "This is expected if your repo is installed on a remote file system." fi echo "It is recommended to install your repo on a local file system." - echo "You can skip the installation of the Chrome OS default founts with" + echo "You can skip the installation of the Chrome OS default fonts with" echo "the command line option: --no-chromeos-fonts." exit 1 fi diff --git a/build/linux/install-chromeos-fonts.py b/build/linux/install-chromeos-fonts.py index da8fb40f48d55e..35cd3bc7c6c435 100755 --- a/build/linux/install-chromeos-fonts.py +++ b/build/linux/install-chromeos-fonts.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2013 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file.