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

Side by Side Diff: chrome/tools/build/linux/chrome-wrapper

Issue 548113: Linux: Change the generic chrome-wrapper script to overwrite symlinks it crea... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 2
3 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2006-2009 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 LIBDIRS="/lib64 /lib /usr/lib64 /usr/lib" 87 LIBDIRS="/lib64 /lib /usr/lib64 /usr/lib"
88 fi 88 fi
89 89
90 echo $MISSING_LIBS | grep -qs libbz2.so.1.0 90 echo $MISSING_LIBS | grep -qs libbz2.so.1.0
91 if [ $? = 0 ]; then 91 if [ $? = 0 ]; then
92 for dir in $LIBDIRS 92 for dir in $LIBDIRS
93 do 93 do
94 if [ -e "$dir/libbz2.so.1" ]; then 94 if [ -e "$dir/libbz2.so.1" ]; then
95 LIB_ARCH=$(check_executable "$dir/libbz2.so.1") 95 LIB_ARCH=$(check_executable "$dir/libbz2.so.1")
96 if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then 96 if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then
97 ln -s "$dir/libbz2.so.1" "$HERE/libbz2.so.1.0" 97 ln -snf "$dir/libbz2.so.1" "$HERE/libbz2.so.1.0"
98 break; 98 break;
99 fi 99 fi
100 fi 100 fi
101 done 101 done
102 fi 102 fi
103 103
104 for lib in libnspr4.so.0d libnss3.so.1d libnssutil3.so.1d libplc4.so.0d libplds4 .so.0d libsmime3.so.1d libssl3.so.1d 104 for lib in libnspr4.so.0d libnss3.so.1d libnssutil3.so.1d libplc4.so.0d libplds4 .so.0d libsmime3.so.1d libssl3.so.1d
105 do 105 do
106 echo $MISSING_LIBS | grep -qs $lib 106 echo $MISSING_LIBS | grep -qs $lib
107 if [ $? = 0 ]; then 107 if [ $? = 0 ]; then
108 reallib=$(echo $lib | sed 's/\.[01]d$//') 108 reallib=$(echo $lib | sed 's/\.[01]d$//')
109 for dir in $LIBDIRS 109 for dir in $LIBDIRS
110 do 110 do
111 if [ -e "$dir/$reallib" ]; then 111 if [ -e "$dir/$reallib" ]; then
112 LIB_ARCH=$(check_executable "$dir/$reallib") 112 LIB_ARCH=$(check_executable "$dir/$reallib")
113 if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then 113 if [ "$CHROME_ARCH" = "$LIB_ARCH" ]; then
114 ln -s "$dir/$reallib" "$HERE/$lib" 114 ln -snf "$dir/$reallib" "$HERE/$lib"
115 break; 115 break;
116 fi 116 fi
117 fi 117 fi
118 done 118 done
119 fi 119 fi
120 done 120 done
121 121
122 # Custom version string for this release. This can be used to add a downstream 122 # Custom version string for this release. This can be used to add a downstream
123 # vendor string or release channel information. 123 # vendor string or release channel information.
124 export CHROME_VERSION_EXTRA="custom" 124 export CHROME_VERSION_EXTRA="custom"
125 125
126 exists_desktop_file || generate_desktop_file 126 exists_desktop_file || generate_desktop_file
127 127
128 exec "$HERE/chrome" "$@" 128 exec "$HERE/chrome" "$@"
OLDNEW
« 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