Permalink
Browse files

Add product id to distribution packages. product id is needed by othe…

…r tools
  • Loading branch information...
gregneagle committed Nov 8, 2017
1 parent 9526fab commit 293a707eff24eaf353704c039b64443e4ddd739e
Showing with 3 additions and 1 deletion.
  1. +2 −1 code/tools/make_munki_mpkg.sh
  2. +1 −0 code/tools/make_munki_mpkg_DEP.sh
@@ -561,9 +561,10 @@ cat > "$DISTFILE" <<EOF
<pkg-ref id="$PKGID.core" installKBytes="$CORESIZE" version="$VERSION" auth="Root">${PKGPREFIX}munkitools_core-$VERSION.pkg</pkg-ref>
<pkg-ref id="$PKGID.admin" installKBytes="$ADMINSIZE" version="$VERSION" auth="Root">${PKGPREFIX}munkitools_admin-$VERSION.pkg</pkg-ref>
<pkg-ref id="$PKGID.app" installKBytes="$APPSIZE" version="$MSUVERSION" auth="Root">${PKGPREFIX}munkitools_app-$APPSVERSION.pkg</pkg-ref>
<pkg-ref id="$PKGID.launchd" installKBytes="$LAUNCHDSIZE" version="$VERSION" auth="Root" onConclusion="RequireRestart">${PKGPREFIX}munkitools_launchd-$LAUNCHDVERSION.pkg</pkg-ref>
<pkg-ref id="$PKGID.launchd" installKBytes="$LAUNCHDSIZE" version="$LAUNCHDVERSION" auth="Root" onConclusion="RequireRestart">${PKGPREFIX}munkitools_launchd-$LAUNCHDVERSION.pkg</pkg-ref>
<pkg-ref id="$PKGID.app_usage" installKBytes="$APPUSAGEIZE" version="$VERSION" auth="Root">${PKGPREFIX}munkitools_app_usage-$VERSION.pkg</pkg-ref>
$CONFREF
<product id="$PKGID" version="$VERSION" />
</installer-script>
EOF

@@ -585,6 +585,7 @@ function requirerestart() {
<pkg-ref id="$PKGID.launchd" installKBytes="$LAUNCHDSIZE" version="$VERSION" auth="Root" onConclusionScript="requirerestart()">${PKGPREFIX}munkitools_launchd-$LAUNCHDVERSION.pkg</pkg-ref>
<pkg-ref id="$PKGID.app_usage" installKBytes="$APPUSAGEIZE" version="$VERSION" auth="Root">${PKGPREFIX}munkitools_app_usage-$VERSION.pkg</pkg-ref>
$CONFREF
<product id="$PKGID" version="$VERSION" />
</installer-script>
EOF

0 comments on commit 293a707

Please sign in to comment.