OLD | NEW |
1 #!/bin/bash | 1 #!/bin/bash |
2 # | 2 # |
3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2011 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 # Let the wrapped binary know that it has been run through the wrapper. | 7 # Let the wrapped binary know that it has been run through the wrapper. |
8 export CHROME_WRAPPER="`readlink -f "$0"`" | 8 export CHROME_WRAPPER="`readlink -f "$0"`" |
9 | 9 |
10 HERE="`dirname "$CHROME_WRAPPER"`" | 10 HERE="`dirname "$CHROME_WRAPPER"`" |
(...skipping 16 matching lines...) Expand all Loading... |
27 | 27 |
28 # Always use our versions of ffmpeg libs. | 28 # Always use our versions of ffmpeg libs. |
29 # This also makes RPMs find the compatibly-named library symlinks. | 29 # This also makes RPMs find the compatibly-named library symlinks. |
30 if [[ -n "$LD_LIBRARY_PATH" ]]; then | 30 if [[ -n "$LD_LIBRARY_PATH" ]]; then |
31 LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" | 31 LD_LIBRARY_PATH="$HERE:$HERE/lib:$LD_LIBRARY_PATH" |
32 else | 32 else |
33 LD_LIBRARY_PATH="$HERE:$HERE/lib" | 33 LD_LIBRARY_PATH="$HERE:$HERE/lib" |
34 fi | 34 fi |
35 export LD_LIBRARY_PATH | 35 export LD_LIBRARY_PATH |
36 | 36 |
| 37 # Pass LD_LIBRARY_PATH to nacl_helper |
| 38 export NACL_ENV_PASSTHROUGH=LD_LIBRARY_PATH |
| 39 |
37 export CHROME_VERSION_EXTRA="@@CHANNEL@@" | 40 export CHROME_VERSION_EXTRA="@@CHANNEL@@" |
38 | 41 |
39 # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120 | 42 # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120 |
40 export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME | 43 export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME |
41 | 44 |
42 # Sanitize std{in,out,err} because they'll be shared with untrusted child | 45 # Sanitize std{in,out,err} because they'll be shared with untrusted child |
43 # processes (http://crbug.com/376567). | 46 # processes (http://crbug.com/376567). |
44 exec < /dev/null | 47 exec < /dev/null |
45 exec > >(exec cat) | 48 exec > >(exec cat) |
46 exec 2> >(exec cat >&2) | 49 exec 2> >(exec cat >&2) |
47 | 50 |
48 # Make sure that the profile directory specified in the environment, if any, | 51 # Make sure that the profile directory specified in the environment, if any, |
49 # overrides the default. | 52 # overrides the default. |
50 if [[ -n "$CHROME_USER_DATA_DIR" ]]; then | 53 if [[ -n "$CHROME_USER_DATA_DIR" ]]; then |
51 # Note: exec -a below is a bashism. | 54 # Note: exec -a below is a bashism. |
52 exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ \ | 55 exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ \ |
53 --user-data-dir="$CHROME_USER_DATA_DIR" "$@" | 56 --user-data-dir="$CHROME_USER_DATA_DIR" "$@" |
54 else | 57 else |
55 exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ "$@" | 58 exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ "$@" |
56 fi | 59 fi |
OLD | NEW |