From 33b5cd28bb89e2a3d578b7742333d6f103964923 Mon Sep 17 00:00:00 2001
From: Greg Neagle <gregneagle@mac.com>
Date: Mon, 9 May 2011 15:36:24 +0000
Subject: [PATCH] Change choiceIdentifiers in Distribution.dist to more
 descriptive labels.

git-svn-id: http://munki.googlecode.com/svn/trunk@1169 a4e17f2e-e282-11dd-95e1-755cbddbdd66
---
 code/tools/make_munki_mpkg.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/tools/make_munki_mpkg.sh b/code/tools/make_munki_mpkg.sh
index e75a22ec..39dd4597 100755
--- a/code/tools/make_munki_mpkg.sh
+++ b/code/tools/make_munki_mpkg.sh
@@ -423,8 +423,8 @@ if [ ! -z "$CONFPKG" ]; then
         CONFVERSION=`defaults read "$CONFPKG/Contents/Info" CFBundleShortVersionString`
         CONFBASENAME=`basename "$CONFPKG"`
     fi
-    CONFOUTLINE="<line choice=\"choice4\"/>"
-    CONFCHOICE="<choice id=\"choice4\" title=\"$CONFTITLE\" description=\"$CONFDESC\">
+    CONFOUTLINE="<line choice=\"config\"/>"
+    CONFCHOICE="<choice id=\"config\" title=\"$CONFTITLE\" description=\"$CONFDESC\">
         <pkg-ref id=\"$CONFID\"/>
     </choice>"
     CONFREF="<pkg-ref id=\"$CONFID\" installKBytes=\"$CONFSIZE\" version=\"$CONFVERSION\" auth=\"Root\">${PKGPREFIX}$CONFBASENAME</pkg-ref>"
@@ -436,22 +436,22 @@ cat > "$DISTFILE" <<EOF
     <options customize="allow" allow-external-scripts="no"/>
     <domains enable_anywhere="true"/>
     <choices-outline>
-        <line choice="choice0"/>
-        <line choice="choice1"/>
-        <line choice="choice2"/>
-        <line choice="choice3"/>
+        <line choice="core"/>
+        <line choice="admin"/>
+        <line choice="app"/>
+        <line choice="launchd"/>
         $CONFOUTLINE
     </choices-outline>
-    <choice id="choice0" title="$CORETITLE" description="$COREDESC">
+    <choice id="core" title="$CORETITLE" description="$COREDESC">
         <pkg-ref id="$PKGID.core"/>
     </choice>
-    <choice id="choice1" title="$ADMINTITLE" description="$ADMINDESC">
+    <choice id="admin" title="$ADMINTITLE" description="$ADMINDESC">
         <pkg-ref id="$PKGID.admin"/>
     </choice>
-    <choice id="choice2" title="$APPTITLE" description="$APPDESC">
+    <choice id="app" title="$APPTITLE" description="$APPDESC">
         <pkg-ref id="$PKGID.app"/>
     </choice>
-    <choice id="choice3" title="$LAUNCHDTITLE" description="$LAUNCHDDESC">
+    <choice id="launchd" title="$LAUNCHDTITLE" description="$LAUNCHDDESC">
         <pkg-ref id="$PKGID.launchd"/>
     </choice>
     $CONFCHOICE