Update keystone_install.sh after r49334

chrome/installer/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:
@@ skipping 213 matching lines @@
 if [ -z "${SRC}" ] || [ "${SRC:0:1}" != "/" ] || [ ! -d "${SRC}" ] ; then
   exit 2
 fi
 
 # Figure out where we're going.  Determine the application version to be
 # installed, use that to locate the framework, and then look inside the
 # framework for the Keystone product ID.
 APP_VERSION_KEY="CFBundleShortVersionString"
 UPD_VERSION_APP=$(defaults read "${SRC}/Contents/Info" "${APP_VERSION_KEY}" ||
                   exit 2)
-UPD_KS_PLIST="${SRC}/Contents/Versions/${UPD_VERSION_APP}/${FRAMEWORK_DIR}/Resources/Info"
+UPD_KS_PLIST="${SRC}/Contents/Info"
 KS_VERSION_KEY="KSVersion"
 UPD_VERSION_KS=$(defaults read "${UPD_KS_PLIST}" "${KS_VERSION_KEY}" || exit 2)
 PRODUCT_ID=$(defaults read "${UPD_KS_PLIST}" KSProductID || exit 2)
 if [ -z "${UPD_VERSION_KS}" ] || [ -z "${PRODUCT_ID}" ] ; then
   exit 3
 fi
 DEST=$(ksadmin -pP "${PRODUCT_ID}" |
        sed -Ene \
            's%^[[:space:]]+xc=<KSPathExistenceChecker:.* path=(/.+)>$%\1%p')
 
@@ skipping 157 matching lines @@
 # timestamp to something newer than what had been on disk.  This is not
 # considered a critical step, and if it fails, this script will not exit.
 if [ -n "${NEEDS_TOUCH}" ] ; then
   touch -cf "${DEST}" || true
 fi
 
 # Read the new values (e.g. version).  Get the installed application version
 # to get the path to the framework, where the Keystone keys are stored.
 NEW_VERSION_APP=$(defaults read "${DEST}/Contents/Info" "${APP_VERSION_KEY}" ||
                   exit 9)
-NEW_KS_PLIST="${DEST}/Contents/Versions/${NEW_VERSION_APP}/${FRAMEWORK_DIR}/Resources/Info"
+NEW_KS_PLIST="${DEST}/Contents/Info"
 NEW_VERSION_KS=$(defaults read "${NEW_KS_PLIST}" "${KS_VERSION_KEY}" || exit 9)
 URL=$(defaults read "${NEW_KS_PLIST}" KSUpdateURL || exit 9)
 # The channel ID is optional.  Suppress stderr to prevent Keystone from seeing
 # possible error output.
 CHANNEL_ID_KEY=KSChannelID
 CHANNEL_ID=$(defaults read "${NEW_KS_PLIST}" "${CHANNEL_ID_KEY}" 2>/dev/null ||
              true)
 
 # Make sure that the update was successful by comparing the version found in
 # the update with the version now on disk.
@@ skipping 231 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