Installer fixes.
- Set correct update server URL.
- Add missing '$' resulting in a bad existence checker path in
the WebM postinstall script.
- Remove keystone registration and unregistration of XiphQT.
- Remove XiphQT postinstall/postupgrade script, and remove
the reference to it from the XiphQT installer.
Change-Id: I6fb3737809beddb2e898555d0fa7094e8388179f
diff --git a/installer/scripts/uninstall_helper.sh b/installer/scripts/uninstall_helper.sh
index 4689c5c..2bf2435 100755
--- a/installer/scripts/uninstall_helper.sh
+++ b/installer/scripts/uninstall_helper.sh
@@ -34,16 +34,19 @@
dbglog "${BUNDLE} does not exist."
fi
- # Always unregister the component bundle ID; the user might have manually
- # deleted the component.
- local readonly KEYSTONE="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/MacOS/ksadmin"
- if [[ -e "${KEYSTONE}" ]]; then
- dbglog "${KEYSTONE} --delete --productid ${BUNDLE_ID}"
- ${KEYSTONE} --delete --productid ${BUNDLE_ID}
+ # Only the WebM bundle is registered with keystone, so unregister only when
+ # |BUNDLE_ID| and |WEBM_ID| match.
+ if [[ "${BUNDLE_ID}" == "${WEBM_ID}" ]]; then
+ # Don't bother checking if the bundle exists-- always unregister the WebM
+ # component bundle ID; the user might have manually deleted the component.
+ local readonly KEYSTONE="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/MacOS/ksadmin"
+ if [[ -e "${KEYSTONE}" ]]; then
+ dbglog "${KEYSTONE} --delete --productid ${BUNDLE_ID}"
+ ${KEYSTONE} --delete --productid ${BUNDLE_ID}
+ fi
fi
- # Same for the package receipt; always remove it from the package receipt
- # data base.
+ # Always remove receipt from the package receipt database.
local readonly PKGUTIL="/usr/sbin/pkgutil"
local readonly PACKAGE_ID_SUFFIX=".pkg"
local readonly PACKAGE_ID="${BUNDLE_ID}${PACKAGE_ID_SUFFIX}"
diff --git a/installer/scripts/webm/postinstall.sh b/installer/scripts/webm/postinstall.sh
index 461b57d..3a6ad18 100644
--- a/installer/scripts/webm/postinstall.sh
+++ b/installer/scripts/webm/postinstall.sh
@@ -12,7 +12,7 @@
readonly WEBM_COMPONENT="AWebM.component"
readonly WEBM_ID="org.webmproject.webmquicktime.component"
readonly WEBM_VERSION="0.3.0"
-readonly UPDATE_URL="TODO"
+readonly UPDATE_URL="https://tools.google.com/service/update2"
dbglog() {
logger "WebM postinstall: $@"
@@ -23,5 +23,5 @@
${KEYSTONE} --register \
--productid "${WEBM_ID}" \
--version "${WEBM_VERSION}" \
- --xcpath "${QT_SYS_PATH}{WEBM_COMPONENT}" \
+ --xcpath "${QT_SYS_PATH}${WEBM_COMPONENT}" \
--url "${UPDATE_URL}"
diff --git a/installer/scripts/xiphqt/postinstall.sh b/installer/scripts/xiphqt/postinstall.sh
deleted file mode 100644
index 4b945ab..0000000
--- a/installer/scripts/xiphqt/postinstall.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-##
-## Copyright (c) 2012 The WebM project authors. All Rights Reserved.
-##
-## Use of this source code is governed by a BSD-style license
-## that can be found in the LICENSE file in the root of the source
-## tree. An additional intellectual property rights grant can be found
-## in the file PATENTS. All contributing project authors may
-## be found in the AUTHORS file in the root of the source tree.
-readonly KEYSTONE="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/MacOS/ksadmin"
-readonly QT_SYS_PATH="/Library/QuickTime/"
-readonly XIPHQT_COMPONENT="XiphQT.component"
-readonly XIPHQT_ID="org.xiph.xiph-qt.xiphqt"
-readonly XIPHQT_VERSION="0.1.9"
-readonly UPDATE_URL="TODO"
-
-dbglog() {
- logger "XiphQT postinstall: $@"
-}
-
-dbglog "script args=$@"
-
-${KEYSTONE} --register \
- --productid "${XIPHQT_ID}" \
- --version "${XIPHQT_VERSION}" \
- --xcpath "${QT_SYS_PATH}{XIPHQT_COMPONENT}" \
- --url "${UPDATE_URL}"
diff --git a/installer/xiphqt_component_install.pmdoc/01xiphqt.xml b/installer/xiphqt_component_install.pmdoc/01xiphqt.xml
index e9c2050..4fa2e24 100644
--- a/installer/xiphqt_component_install.pmdoc/01xiphqt.xml
+++ b/installer/xiphqt_component_install.pmdoc/01xiphqt.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="0EC5B305-6363-4A50-880D-794A456E3706"><config><identifier>org.xiph.xiph-qt.xiphqt.pkg</identifier><version>0.1.9</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">../third_party/xiphqt/XiphQT.component</installFrom><installTo mod="true">/Library/QuickTime</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.isRelativeType</mod><mod>installTo</mod><mod>installTo.path</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>scripts.preinstall.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>identifier</mod><mod>version</mod><mod>parent</mod><mod>scripts.preupgrade.isRelativeType</mod><mod>scripts.postinstall.isRelativeType</mod></config><scripts><preinstall relative="true" mod="true">scripts/xiphqt/preinstall.sh</preinstall><postinstall relative="true" mod="true">scripts/xiphqt/postinstall.sh</postinstall><preupgrade relative="true" mod="true">scripts/xiphqt/preinstall.sh</preupgrade><postupgrade relative="true" mod="true">scripts/xiphqt/postinstall.sh</postupgrade><scripts-dir relative="true" mod="true">scripts</scripts-dir></scripts><contents><file-list>01xiphqt-contents.xml</file-list><component id="org.xiph.xiph-qt.xiphqt" path="/Users/tomfinegan/webmquicktime/third_party/xiphqt/XiphQT.component" version="0.1.9"/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="0EC5B305-6363-4A50-880D-794A456E3706"><config><identifier>org.xiph.xiph-qt.xiphqt.pkg</identifier><version>0.1.9</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" includeRoot="true">../third_party/xiphqt/XiphQT.component</installFrom><installTo mod="true">/Library/QuickTime</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>scripts.preupgrade.isRelativeType</mod><mod>scripts.scriptsDirectoryPath.isRelativeType</mod><mod>installTo</mod><mod>scripts.postinstall.path</mod><mod>scripts.postinstall.isRelativeType</mod><mod>installFrom.isRelativeType</mod><mod>version</mod><mod>scripts.preinstall.isRelativeType</mod><mod>parent</mod><mod>identifier</mod><mod>scripts.postupgrade.path</mod><mod>scripts.postupgrade.isRelativeType</mod><mod>installTo.path</mod></config><scripts><preinstall relative="true" mod="true">scripts/xiphqt/preinstall.sh</preinstall><preupgrade relative="true" mod="true">scripts/xiphqt/preinstall.sh</preupgrade><scripts-dir relative="true" mod="true">scripts</scripts-dir></scripts><contents><file-list>01xiphqt-contents.xml</file-list><component id="org.xiph.xiph-qt.xiphqt" path="/Users/tomfinegan/webmquicktime/third_party/xiphqt/XiphQT.component" version="0.1.9"/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
