Revert 259287 "Add breakpad support for me2me and it2me native m..."

trunk/src/remoting/host/installer/mac/do_signing.sh

 #!/bin/sh
 
 # 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.
 
 # This script signs the Chromoting binaries, builds the Chrome Remote Desktop
 # installer and then packages it into a .dmg.  It requires that Packages be
 # installed (for 'packagesbuild').
 # Packages: http://s.sudre.free.fr/Software/Packages/about.html
@@ skipping 12 matching lines @@
 
 setup() {
   local input_dir="${1}"
 
   # The file that contains the properties for this signing build.
   # The file should contain only key=value pairs, one per line.
   PROPS_FILENAME="${input_dir}/do_signing.props"
 
   # Individually load the properties for this build. Don't 'source' the file
   # to guard against code accidentally being added to the props file.
+  HOST_UNINSTALLER_NAME=$(read_property "HOST_UNINSTALLER_NAME")
+  HOST_PKG=$(read_property "HOST_PKG")
   DMG_VOLUME_NAME=$(read_property "DMG_VOLUME_NAME")
   DMG_FILE_NAME=$(read_property "DMG_FILE_NAME")
-  HOST_BUNDLE_NAME=$(read_property "HOST_BUNDLE_NAME")
-  HOST_PKG=$(read_property "HOST_PKG")
-  HOST_UNINSTALLER_NAME=$(read_property "HOST_UNINSTALLER_NAME")
-  NATIVE_MESSAGING_HOST_BUNDLE_NAME=$(read_property\
-    "NATIVE_MESSAGING_HOST_BUNDLE_NAME")
-  PREFPANE_BUNDLE_NAME=$(read_property "PREFPANE_BUNDLE_NAME")
-  REMOTE_ASSISTANCE_HOST_BUNDLE_NAME=$(read_property\
-    "REMOTE_ASSISTANCE_HOST_BUNDLE_NAME")
 
   # Binaries to sign.
-  ME2ME_HOST="PrivilegedHelperTools/${HOST_BUNDLE_NAME}"
-  ME2ME_NM_HOST="PrivilegedHelperTools/${HOST_BUNDLE_NAME}/Contents/MacOS/"`
-                `"${NATIVE_MESSAGING_HOST_BUNDLE_NAME}/Contents/MacOS/"`
-                `"native_messaging_host"
-  IT2ME_NM_HOST="PrivilegedHelperTools/${HOST_BUNDLE_NAME}/Contents/MacOS/"`
-                `"${REMOTE_ASSISTANCE_HOST_BUNDLE_NAME}/Contents/MacOS/"`
-                `"remote_assistance_host"
+  ME2ME_HOST='PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app'
+  ME2ME_NM_HOST="${ME2ME_HOST}/Contents/MacOS/native_messaging_host"
+  IT2ME_NM_HOST="${ME2ME_HOST}/Contents/MacOS/remote_assistance_host"
   UNINSTALLER="Applications/${HOST_UNINSTALLER_NAME}.app"
-  PREFPANE="PreferencePanes/${PREFPANE_BUNDLE_NAME}"
+  PREFPANE='PreferencePanes/org.chromium.chromoting.prefPane'
 
   # The Chromoting Host installer is a meta-package that consists of 3
   # components:
   #  * Chromoting Host Service package
   #  * Chromoting Host Uninstaller package
   #  * Keystone package (GoogleSoftwareUpdate - for Official builds only)
-  PKGPROJ_HOST="ChromotingHost.pkgproj"
-  PKGPROJ_HOST_SERVICE="ChromotingHostService.pkgproj"
-  PKGPROJ_HOST_UNINSTALLER="ChromotingHostUninstaller.pkgproj"
+  PKGPROJ_HOST='ChromotingHost.pkgproj'
+  PKGPROJ_HOST_SERVICE='ChromotingHostService.pkgproj'
+  PKGPROJ_HOST_UNINSTALLER='ChromotingHostUninstaller.pkgproj'
 
   # Final (user-visible) pkg name.
   PKG_FINAL="${HOST_PKG}.pkg"
 
   DMG_FILE_NAME="${DMG_FILE_NAME}.dmg"
 
   # Temp directory for Packages output.
   PKG_DIR=build
   g_cleanup_dirs+=("${PKG_DIR}")
 
@@ skipping 23 matching lines @@
     echo "./${path}"
   else
     echo "${path}"
   fi
 }
 
 # Read a single property from the properties file.
 read_property() {
   local property="${1}"
   local filename="${PROPS_FILENAME}"
-  echo `grep "\<${property}\>=" "${filename}" | tail -n 1 | cut -d "=" -f2-`
+  echo `grep "${property}" "${filename}" | tail -n 1 | cut -d "=" -f2-`
 }
 
 verify_clean_dir() {
   local dir="${1}"
   if [[ ! -d "${dir}" ]]; then
     mkdir "${dir}"
   fi
 
   if [[ -e "${output_dir}/${DMG_FILE_NAME}" ]]; then
     err "Output directory is dirty from previous build."
@@ skipping 128 matching lines @@
   cleanup
 }
 
 if [[ ${#} < 2 ]]; then
   usage
   exit 1
 fi
 
 main "${@}"
 exit ${?}