| OLD | NEW |
| 1 #!/bin/sh | 1 #!/bin/sh |
| 2 | 2 |
| 3 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2010 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 # Running Chromium via this script makes it possible to set Chromium as the | 7 # Running Chromium via this script makes it possible to set Chromium as the |
| 8 # default browser directly out of a compile, without needing to package it. | 8 # default browser directly out of a compile, without needing to package it. |
| 9 | 9 |
| 10 DESKTOP="chromium-devel" | 10 DESKTOP="chromium-devel" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 *:$HERE:*) | 74 *:$HERE:*) |
| 75 # $PATH already contains $HERE, leave it where it is. | 75 # $PATH already contains $HERE, leave it where it is. |
| 76 ;; | 76 ;; |
| 77 *) | 77 *) |
| 78 # Prepend $HERE to $PATH. | 78 # Prepend $HERE to $PATH. |
| 79 export PATH="$HERE:$PATH" | 79 export PATH="$HERE:$PATH" |
| 80 ;; | 80 ;; |
| 81 esac | 81 esac |
| 82 | 82 |
| 83 # Always use our ffmpeg and other shared libs. | 83 # Always use our ffmpeg and other shared libs. |
| 84 export LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target:$LD_LIBRARY_PATH" | 84 if [[ -n "$LD_LIBRARY_PATH" ]]; then |
| 85 LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target:$LD_LIBRARY_PATH" |
| 86 else |
| 87 LD_LIBRARY_PATH="$HERE:$HERE/lib:$HERE/lib.target" |
| 88 fi |
| 89 export LD_LIBRARY_PATH |
| 90 |
| 85 | 91 |
| 86 MISSING_LIBS=$(ldd "$HERE/chrome" 2> /dev/null |grep "not found$" | cut -d" " -f
1|sed 's/\t//') | 92 MISSING_LIBS=$(ldd "$HERE/chrome" 2> /dev/null |grep "not found$" | cut -d" " -f
1|sed 's/\t//') |
| 87 CHROME_ARCH=$(check_executable "$HERE/chrome") | 93 CHROME_ARCH=$(check_executable "$HERE/chrome") |
| 88 uname -m | grep -qs x86_64 | 94 uname -m | grep -qs x86_64 |
| 89 if [ $? = 1 ]; then | 95 if [ $? = 1 ]; then |
| 90 LIBDIRS="/lib /lib32 /usr/lib /usr/lib32" | 96 LIBDIRS="/lib /lib32 /usr/lib /usr/lib32" |
| 91 else | 97 else |
| 92 LIBDIRS="/lib64 /lib /usr/lib64 /usr/lib" | 98 LIBDIRS="/lib64 /lib /usr/lib64 /usr/lib" |
| 93 fi | 99 fi |
| 94 | 100 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 124 fi | 130 fi |
| 125 done | 131 done |
| 126 | 132 |
| 127 # Custom version string for this release. This can be used to add a downstream | 133 # Custom version string for this release. This can be used to add a downstream |
| 128 # vendor string or release channel information. | 134 # vendor string or release channel information. |
| 129 export CHROME_VERSION_EXTRA="custom" | 135 export CHROME_VERSION_EXTRA="custom" |
| 130 | 136 |
| 131 exists_desktop_file || generate_desktop_file | 137 exists_desktop_file || generate_desktop_file |
| 132 | 138 |
| 133 exec "$HERE/chrome" "$@" | 139 exec "$HERE/chrome" "$@" |
| OLD | NEW |