Roll reference builds to 35.0.1916.114.

chrome_mac/Google Chrome.app/Contents/Versions/35.0.1916.114/Google Chrome Framework.framework/Resources/keystone_promote_preflight.sh

Index: chrome_mac/Google Chrome.app/Contents/Versions/35.0.1916.114/Google Chrome Framework.framework/Resources/keystone_promote_preflight.sh
===================================================================
--- chrome_mac/Google Chrome.app/Contents/Versions/35.0.1916.114/Google Chrome Framework.framework/Resources/keystone_promote_preflight.sh	(revision 0)
+++ chrome_mac/Google Chrome.app/Contents/Versions/35.0.1916.114/Google Chrome Framework.framework/Resources/keystone_promote_preflight.sh	(revision 0)
@@ -0,0 +1,97 @@
+#!/bin/bash -p
+
+# Copyright (c) 2012 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 as root before Keystone ticket promotion to ensure a suitable
+# environment for Keystone installation.  Ultimately, these features should be
+# integrated directly into the Keystone installation.
+#
+# If the two branding paths are given, then the branding information is also
+# copied and the permissions on the system branding file are set to be owned by
+# root, but readable by anyone.
+#
+# Note that this script will be invoked with the real user ID set to the
+# user's ID, but the effective user ID set to 0 (root).  bash -p is used on
+# the first line to prevent bash from setting the effective user ID to the
+# real user ID (dropping root privileges).
+#
+# TODO(mark): Remove this script when able.  See http://b/2285921 and
+# http://b/2289908.
+
+set -e
+
+# This script runs as root, so be paranoid about things like ${PATH}.
+export PATH="/usr/bin:/usr/sbin:/bin:/sbin"
+
+# Output the pid to stdout before doing anything else.  See
+# base/mac/authorization_util.h.
+echo "${$}"
+
+if [ ${#} -ne 0 ] && [ ${#} -ne 2 ] ; then
+  echo "usage: ${0} [USER_BRAND SYSTEM_BRAND]" >& 2
+  exit 2
+fi
+
+if [ ${#} -eq 2 ] ; then
+  USER_BRAND="${1}"
+  SYSTEM_BRAND="${2}"
+
+  # Make sure that USER_BRAND is an absolute path and that it exists.
+  if [ -z "${USER_BRAND}" ] || \
+     [ "${USER_BRAND:0:1}" != "/" ] || \
+     [ ! -f "${USER_BRAND}" ] ; then
+    echo "${0}: must provide an absolute path naming an existing user file" >& 2
+    exit 3
+  fi
+
+  # Make sure that SYSTEM_BRAND is an absolute path.
+  if [ -z "${SYSTEM_BRAND}" ] || [ "${SYSTEM_BRAND:0:1}" != "/" ] ; then
+    echo "${0}: must provide an absolute path naming a system file" >& 2
+    exit 4
+  fi
+
+  # Make sure the directory for the system brand file exists.
+  SYSTEM_BRAND_DIR=$(dirname "${SYSTEM_BRAND}")
+  if [ ! -e "${SYSTEM_BRAND_DIR}" ] ; then
+    mkdir -p "${SYSTEM_BRAND_DIR}"
+    # Permissions on this directory will be fixed up at the end of this script.
+  fi
+
+  # Copy the brand file
+  cp "${USER_BRAND}" "${SYSTEM_BRAND}" >& /dev/null
+
+  # Ensure the right ownership and permissions
+  chown "root:wheel" "${SYSTEM_BRAND}" >& /dev/null
+  chmod "a+r,u+w,go-w" "${SYSTEM_BRAND}" >& /dev/null
+
+fi
+
+OWNER_GROUP="root:admin"
+CHMOD_MODE="a+rX,u+w,go-w"
+
+LIB_GOOG="/Library/Google"
+if [ -d "${LIB_GOOG}" ] ; then
+  # Just work with the directory.  Don't do anything recursively here, so as
+  # to leave other things in /Library/Google alone.
+  chown -h "${OWNER_GROUP}" "${LIB_GOOG}" >& /dev/null
+  chmod -h "${CHMOD_MODE}" "${LIB_GOOG}" >& /dev/null
+
+  LIB_GOOG_GSU="${LIB_GOOG}/GoogleSoftwareUpdate"
+  if [ -d "${LIB_GOOG_GSU}" ] ; then
+    chown -Rh "${OWNER_GROUP}" "${LIB_GOOG_GSU}" >& /dev/null
+    chmod -R "${CHMOD_MODE}" "${LIB_GOOG_GSU}" >& /dev/null
+
+    # On the Mac, or at least on HFS+, symbolic link permissions are
+    # significant, but chmod -R and -h can't be used together.  Do another
+    # pass to fix the permissions on any symbolic links.
+    find "${LIB_GOOG_GSU}" -type l -exec chmod -h "${CHMOD_MODE}" {} + >& \
+        /dev/null
+
+    # TODO(mark): If GoogleSoftwareUpdate.bundle is missing, dump TicketStore
+    # too?
+  fi
+fi
+
+exit 0
Property changes on: chrome_mac/Google Chrome.app/Contents/Versions/35.0.1916.114/Google Chrome Framework.framework/Resources/keystone_promote_preflight.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:eol-style
   + LF