commit ed0b174b6e6d7b4c947cdd5a364d4cd43f40ec35
author Tom Finegan <tomfinegan@google.com> Thu Feb 23 16:14:46 2012
committer Tom Finegan <tomfinegan@google.com> Thu Feb 23 23:43:27 2012
tree bd26db706420b991e77528da7bc5d84045c1d990
parent 366787f9e6c1ca1efae9ce0cfbda2f5144b486c1

build_installers: use util.sh and clean up a bit.

Change-Id: I1babbdd212cbba50242d4efc80b27f5de9bcb012

installer/scripts/build/build_installers.sh

diff --git a/installer/scripts/build/build_installers.sh b/installer/scripts/build/build_installers.sh
index ef57f11..956a487 100755
--- a/installer/scripts/build/build_installers.sh
+++ b/installer/scripts/build/build_installers.sh
@@ -13,26 +13,24 @@
 # GoogleSoftwareUpdate.pkg
 set -e
 
-dbglog() {
-  echo "build_installers: $@"
-}
-
-readonly PKGMAKER="/Developer/usr/bin/packagemaker"
-if [[ ! -e "${PKGMAKER}" ]]; then
-  dbglog "ERROR, ${PKGMAKER} does not exist."
+if [[ $(basename $(pwd)) != "installer" ]] || \
+    [[ $(basename $(dirname $(pwd))) != "webmquicktime" ]]; then
+  echo "$(basename $0) must be run from webmquicktime/installer"
   exit 1
 fi
 
+source scripts/build/util.sh
+
+readonly PKGMAKER="/Developer/usr/bin/packagemaker"
+file_exists "${PKGMAKER}" || die "${PKGMAKER} does not exist."
+
 build_installer() {
   local readonly PMDOC="$1"
   local readonly PACKAGE="$2"
   local readonly RM="rm -r -f"
 
   # Confirm the pmdoc exists.
-  if [[ ! -e "${PMDOC}" ]]; then
-    dbglog "ERROR, PMDOC ${PMDOC} does not exist!"
-    exit 1
-  fi
+  file_exists "${PMDOC}" || die "${PMDOC} does not exist!"
 
   # Delete the output package if it exists.
   if [[ -e "${PACKAGE}" ]]; then
@@ -43,12 +41,9 @@
   ${PKGMAKER} -d "${PMDOC}" -o "${PACKAGE}"
 
   # Confirm that the package was built.
-  if [[ ! -e "${PACKAGE}" ]]; then
-    dbglog "ERROR, build failed for PACKAGE ${PACKAGE}!"
-    exit 1
-  fi
+  file_exists "${PACKAGE}"|| die "${PACKAGE} build failed."
 
-  dbglog "${PACKAGE} build successful."
+  debuglog "${PACKAGE} build successful."
 }
 
 show_full_installer_warning() {
@@ -59,9 +54,9 @@
   # Nice long note about PackageMaker manual build requirements. Why, oh why,
   # does the stupid thing have to crash _every_ time when used on the command
   # line.
-  dbglog "${INSTALLER_PMDOC} must be opened in PackageMaker and built manually"
-  dbglog "to create ${INSTALLER_PACKAGE}. PackageMaker will always crash when"
-  dbglog "${INSTALLER_PMDOC} is built from the command line."
+  debuglog "${INSTALLER_PMDOC} must be opened in PackageMaker and built manually"
+  debuglog "to create ${INSTALLER_PACKAGE}. PackageMaker will always crash when"
+  debuglog "${INSTALLER_PMDOC} is built from the command line."
 }
 
 # WebM components installer project and output package file names.
@@ -98,4 +93,4 @@
   build_installer "${XIPHQT_UPDATER_PMDOC}" "${XIPHQT_UPDATER_PACKAGE}"
 fi
 
-dbglog "Done."
+debuglog "Done."