Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1677)

Unified Diff: build/install-build-deps.sh

Issue 24231003: Move call to install-chromeos-fonts after running apt-get (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/install-build-deps.sh
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index a0a019d90d739db73ce6d04caec5978f0459f3e4..8296cb8928c09fff601ecd245843a3ae328f959d 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -221,27 +221,6 @@ else
dbg_list=
fi
-# Install the Chrome OS default fonts.
-if test "$do_inst_chromeos_fonts" != "0"; then
- echo
- echo "Installing Chrome OS fonts."
- dir=`echo $0 | sed -r -e 's/\/[^/]+$//'`
- if ! sudo $dir/linux/install-chromeos-fonts.py; then
- echo "ERROR: The installation of the Chrome OS default fonts failed."
- if [ `stat -f -c %T $dir` == "nfs" ]; then
- echo "The reason is that your repo is installed on a remote file system."
- else
- 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 "the command line option: --no-chromeos-fonts."
- exit 1
- fi
-else
- echo "Skipping installation of Chrome OS fonts."
-fi
-
# When cross building for arm on 64-bit systems the host binaries
# that are part of v8 need to be compiled with -m32 which means
# that basic multilib support is needed.
@@ -305,6 +284,28 @@ else
exit 100
fi
+# Install the Chrome OS default fonts. This must go after running
+# apt-get, since install-chromeos-fonts depends on curl.
+if test "$do_inst_chromeos_fonts" != "0"; then
+ echo
+ echo "Installing Chrome OS fonts."
+ dir=`echo $0 | sed -r -e 's/\/[^/]+$//'`
+ if ! sudo $dir/linux/install-chromeos-fonts.py; then
+ echo "ERROR: The installation of the Chrome OS default fonts failed."
+ if [ `stat -f -c %T $dir` == "nfs" ]; then
+ echo "The reason is that your repo is installed on a remote file system."
+ else
+ 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 "the command line option: --no-chromeos-fonts."
+ exit 1
+ fi
+else
+ echo "Skipping installation of Chrome OS fonts."
+fi
+
# Install 32bit backwards compatibility support for 64bit systems
if [ "$(uname -m)" = "x86_64" ]; then
if test "$do_inst_lib32" != "1"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698