Merge r33259 from the trunk to the 249 branch....

chrome/tools/build/mac/keystone_install.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Called by the Keystone system to update the installed application with a new
 # version from a disk image.
 
 # Return values:
 # 0  Happiness
 # 1  Unknown failure
 # 2  Basic sanity check source failure (e.g. no app on disk image)
 # 3  Basic sanity check destination failure (e.g. ticket points to nothing)
 # 4  Update driven by user ticket when a system ticket is also present
 # 5  Could not prepare existing installed version to receive update
 # 6  rsync failed (could not assure presence of Versions directory)
 # 7  rsync failed (could not copy new versioned directory to Versions)
 # 8  rsync failed (could not update outer .app bundle)
 # 9  Could not get the version, update URL, or channel after update
 # 10 Updated application does not have the version number from the update
 # 11 ksadmin failure
 
 set -e
 
+# http://b/2290916: Keystone runs the installation with a restrictive PATH
+# that only includes the directory containing ksadmin, /bin, and /usr/bin.  It
+# does not include /sbin or /usr/sbin.  This script uses lsof, which is in
+# /usr/sbin, and it's conceivable that it might want to use other tools in an
+# sbin directory.  Adjust the path accordingly.
+export PATH="${PATH}:/sbin:/usr/sbin"
+
 # Returns 0 (true) if the parameter exists, is a symbolic link, and appears
 # writable on the basis of its POSIX permissions.  This is used to determine
 # writeability like test's -w primary, but -w resolves symbolic links and this
 # function does not.
 function is_writable_symlink() {
   SYMLINK=${1}
   LINKMODE=$(stat -f %Sp "${SYMLINK}" 2> /dev/null || true)
   if [ -z "${LINKMODE}" ] || [ "${LINKMODE:0:1}" != "l" ] ; then
     return 1
   fi
@@ skipping 461 matching lines @@
    ([ ${OS_MAJOR} -eq 10 ] && [ ${OS_MINOR} -ge 6 ]) ; then
   # On 10.6, xattr supports -r for recursive operation.
   xattr -d -r "${QUARANTINE_ATTR}" "${DEST}" >& /dev/null
 else
   # On earlier systems, xattr doesn't support -r, so run xattr via find.
   find "${DEST}" -exec xattr -d "${QUARANTINE_ATTR}" {} + >& /dev/null
 fi
 
 # Great success!
 exit 0