Switch exit status from 77 (try again later) back to 12/13 (errors)

chrome/installer/mac/keystone_install.sh

 #!/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.
 
 # usage: keystone_install.sh update_dmg_mount_point
 #
 # Called by the Keystone system to update the installed application with a new
 # version from a disk image.
@@ skipping 11 matching lines @@
 #  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  Patch sanity check failure
 #  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
+# 12  dirpatcher failed for versioned directory
+# 13  dirpatcher failed for outer .app bundle
 #
-# The following exit codes can be used to convey special meaning to Keystone:
+# The following exit codes can be used to convey special meaning to Keystone.
+# KeystoneRegistration will present these codes to Chrome as "success."
 # 66  (unused) success, request reboot
-# 77  try installation again later
+# 77  (unused) try installation again later
 
 set -eu
 
 # 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"
 
@@ skipping 972 matching lines @@
     note "dirpatching versioned directory"
     if ! "${dirpatcher}" "${old_versioned_dir}" \
                          "${patch_versioned_dir}" \
                          "${versioned_dir_target}"; then
       err "dirpatcher of versioned directory failed, status ${PIPESTATUS[0]}"
       mark_failed_patch_update "${product_id}" \
                                "${want_full_installer_path}" \
                                "${old_ks_plist}" \
                                "${old_version_app}" \
                                "${system_ticket}"
-      exit 77
+      exit 12
     fi
   fi
 
   # Copy the versioned directory.  The new versioned directory should have a
   # different name than any existing one, so this won't harm anything already
   # present in ${installed_versions_dir}, including the versioned directory
   # being used by any running processes.  If this step is interrupted, there
   # will be an incomplete versioned directory left behind, but it won't
   # won't interfere with anything, and it will be replaced or removed during a
   # future update attempt.
@@ skipping 38 matching lines @@
     note "dirpatching app directory"
     if ! "${dirpatcher}" "${installed_app}" \
                          "${patch_app_dir}" \
                          "${update_app}"; then
       err "dirpatcher of app directory failed, status ${PIPESTATUS[0]}"
       mark_failed_patch_update "${product_id}" \
                                "${want_full_installer_path}" \
                                "${old_ks_plist}" \
                                "${old_version_app}" \
                                "${system_ticket}"
-      exit 77
+      exit 13
     fi
   fi
 
   # See if the timestamp of what's currently on disk is newer than the
   # update's outer .app's timestamp.  rsync will copy the update's timestamp
   # over, but if that timestamp isn't as recent as what's already on disk, the
   # .app will need to be touched.
   local needs_touch=
   if [[ "${installed_app}" -nt "${update_app}" ]]; then
     needs_touch="y"
@@ skipping 449 matching lines @@
 
 # Check "less than" instead of "not equal to" in case Keystone ever changes to
 # pass more arguments.
 if [[ ${#} -lt 1 ]]; then
   usage
   exit 2
 fi
 
 main "${@}"
 exit ${?}