| Index: chrome/installer/mac/sign_versioned_dir.sh.in
|
| diff --git a/chrome/installer/mac/sign_versioned_dir.sh.in b/chrome/installer/mac/sign_versioned_dir.sh.in
|
| index 2d03ee453af61ca71ca599ff4c36a9d83278d23f..5ac3eaa34281def52b5d46b88c0ea8485e2ce7db 100644
|
| --- a/chrome/installer/mac/sign_versioned_dir.sh.in
|
| +++ b/chrome/installer/mac/sign_versioned_dir.sh.in
|
| @@ -23,6 +23,9 @@ export -n SHELLOPTS
|
| ME="$(basename "${0}")"
|
| readonly ME
|
|
|
| +script_dir="$(dirname "${0}")"
|
| +source "${script_dir}/variables.sh"
|
| +
|
| codesign_display_and_verify() {
|
| path=${1}
|
| shift
|
| @@ -33,14 +36,19 @@ codesign_display_and_verify() {
|
| codesign --verify --verbose=6 "${@}" "${path}"
|
| }
|
|
|
| -if [[ ${#} -ne 3 ]]; then
|
| - echo "usage: ${ME} app_path codesign_keychain codesign_id" >& 2
|
| +if [[ ${#} -ne 3 && ${#} -ne 4 ]]; then
|
| + echo "usage: ${ME} app_path codesign_keychain codesign_id [--development]" >& 2
|
| exit 1
|
| fi
|
|
|
| app_path="${1}"
|
| codesign_keychain="${2}"
|
| codesign_id="${3}"
|
| +is_development=false
|
| +
|
| +if [[ ${#} == 4 && ${4} == "--development" ]]; then
|
| + is_development=true
|
| +fi
|
|
|
| versioned_dir="${app_path}/Contents/Versions/@VERSION@"
|
|
|
| @@ -57,17 +65,10 @@ helper_app="${versioned_dir}/@MAC_PRODUCT_NAME@ Helper.app"
|
| app_mode_loader_app="${framework}/Resources/app_mode_loader.app"
|
| app_mode_loader="${app_mode_loader_app}/Contents/MacOS/app_mode_loader"
|
|
|
| -requirement_suffix="\
|
| -and (certificate leaf = H\"85cee8254216185620ddc8851c7a9fc4dfe120ef\" or \
|
| -certificate leaf = H\"c9a99324ca3fcb23dbcc36bd5fd4f9753305130a\") \
|
| -"
|
| -
|
| -enforcement_flags_app="restrict"
|
| -enforcement_flags="${enforcement_flags_app},library"
|
|
|
| codesign --sign "${codesign_id}" --keychain "${codesign_keychain}" \
|
| "${crashpad_handler}" \
|
| - --options "${enforcement_flags}" \
|
| + --options "${enforcement_flags_helpers}" \
|
| -r="designated => identifier \"crashpad_handler\" \
|
| ${requirement_suffix}"
|
|
|
| @@ -81,7 +82,7 @@ cp "${app_mode_loader}" "${app_mode_loader_tmp}"
|
| codesign --sign "${codesign_id}" --keychain "${codesign_keychain}" \
|
| "${app_mode_loader_tmp}" \
|
| --identifier app_mode_loader \
|
| - --options "${enforcement_flags}" \
|
| + --options "${enforcement_flags_helpers}" \
|
| -r="designated => identifier \"app_mode_loader\" \
|
| ${requirement_suffix}"
|
| cp "${app_mode_loader_tmp}" "${app_mode_loader}"
|
| @@ -89,11 +90,11 @@ rm -f "${app_mode_loader_tmp}"
|
|
|
| codesign --sign "${codesign_id}" --keychain "${codesign_keychain}" \
|
| "${notification_service}" \
|
| - --options "${enforcement_flags}" \
|
| + --options "${enforcement_flags_helpers}" \
|
| -r="designated => identifier \"com.google.Chrome.framework.AlertNotificationService\" \
|
| ${requirement_suffix}"
|
|
|
| -# The framework is a dylib, so ${enforcement_flags} are meaningless.
|
| +# The framework is a dylib, so ${enforcement_flags_helpers} are meaningless.
|
| codesign --sign "${codesign_id}" --keychain "${codesign_keychain}" \
|
| "${framework}" \
|
| -r="designated => identifier \"com.google.Chrome.framework\" \
|
|
|