| OLD | NEW |
| 1 #!/bin/bash -e | 1 #!/bin/bash -e |
| 2 | 2 |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # Script to install everything needed to build chromium (well, ideally, anyway) | 7 # Script to install everything needed to build chromium (well, ideally, anyway) |
| 8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions | 8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions |
| 9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit | 9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit |
| 10 | 10 |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 arm_list= | 297 arm_list= |
| 298 fi | 298 fi |
| 299 | 299 |
| 300 if test "$do_inst_nacl" = "1"; then | 300 if test "$do_inst_nacl" = "1"; then |
| 301 echo "Including NaCl, NaCl toolchain, NaCl ports dependencies." | 301 echo "Including NaCl, NaCl toolchain, NaCl ports dependencies." |
| 302 else | 302 else |
| 303 echo "Skipping NaCl, NaCl toolchain, NaCl ports dependencies." | 303 echo "Skipping NaCl, NaCl toolchain, NaCl ports dependencies." |
| 304 nacl_list= | 304 nacl_list= |
| 305 fi | 305 fi |
| 306 | 306 |
| 307 # The `sort -r -s -t: -k2` sorts all the :i386 packages to the front, to avoid |
| 308 # confusing dpkg-query (crbug.com/446172). |
| 307 packages="$( | 309 packages="$( |
| 308 echo "${dev_list} ${lib_list} ${dbg_list} ${lib32_list} ${arm_list}"\ | 310 echo "${dev_list} ${lib_list} ${dbg_list} ${lib32_list} ${arm_list}"\ |
| 309 "${nacl_list}" | tr " " "\n" | sort -u | tr "\n" " " | 311 "${nacl_list}" | tr " " "\n" | sort -u | sort -r -s -t: -k2 | tr "\n" " " |
| 310 )" | 312 )" |
| 311 | 313 |
| 312 if [ 1 -eq "${do_quick_check-0}" ] ; then | 314 if [ 1 -eq "${do_quick_check-0}" ] ; then |
| 313 failed_check="$(dpkg-query -W -f '${PackageSpec}:${Status}\n' \ | 315 failed_check="$(dpkg-query -W -f '${PackageSpec}:${Status}\n' \ |
| 314 ${packages} 2>&1 | grep -v "ok installed" || :)" | 316 ${packages} 2>&1 | grep -v "ok installed" || :)" |
| 315 if [ -n "${failed_check}" ]; then | 317 if [ -n "${failed_check}" ]; then |
| 316 echo | 318 echo |
| 317 nomatch="$(echo "${failed_check}" | \ | 319 nomatch="$(echo "${failed_check}" | \ |
| 318 sed -e "s/^No packages found matching \(.*\).$/\1/;t;d")" | 320 sed -e "s/^No packages found matching \(.*\).$/\1/;t;d")" |
| 319 missing="$(echo "${failed_check}" | \ | 321 missing="$(echo "${failed_check}" | \ |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 echo "Installing symbolic links for NaCl." | 420 echo "Installing symbolic links for NaCl." |
| 419 if [ ! -r /usr/lib/i386-linux-gnu/libcrypto.so ]; then | 421 if [ ! -r /usr/lib/i386-linux-gnu/libcrypto.so ]; then |
| 420 sudo ln -fs libcrypto.so.0.9.8 /usr/lib/i386-linux-gnu/libcrypto.so | 422 sudo ln -fs libcrypto.so.0.9.8 /usr/lib/i386-linux-gnu/libcrypto.so |
| 421 fi | 423 fi |
| 422 if [ ! -r /usr/lib/i386-linux-gnu/libssl.so ]; then | 424 if [ ! -r /usr/lib/i386-linux-gnu/libssl.so ]; then |
| 423 sudo ln -fs libssl.so.0.9.8 /usr/lib/i386-linux-gnu/libssl.so | 425 sudo ln -fs libssl.so.0.9.8 /usr/lib/i386-linux-gnu/libssl.so |
| 424 fi | 426 fi |
| 425 else | 427 else |
| 426 echo "Skipping symbolic links for NaCl." | 428 echo "Skipping symbolic links for NaCl." |
| 427 fi | 429 fi |
| OLD | NEW |