From 69aa144886569789b879e98505e99edf64599a77 Mon Sep 17 00:00:00 2001
From: Greg Neagle <gregneagle@mac.com>
Date: Sat, 25 Oct 2014 10:12:12 -0700
Subject: [PATCH] Warn that adding a component package is currently not
 implemented/broken

---
 code/tools/make_munki_mpkg.sh | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/code/tools/make_munki_mpkg.sh b/code/tools/make_munki_mpkg.sh
index c3623200..6d1ca4a6 100755
--- a/code/tools/make_munki_mpkg.sh
+++ b/code/tools/make_munki_mpkg.sh
@@ -37,7 +37,7 @@ Usage: `basename $0` [-i id] [-r root] [-o dir] [-c package]"
     -i id       Set the base package bundle ID
     -r root     Set the munki source root
     -o dir      Set the output directory
-    -c package  Include a configuration package
+    -c package  Include a configuration package (NOT CURRENTLY IMPLEMENTED)
 
 EOF
 }
@@ -434,20 +434,22 @@ if [ ! -z "$CONFPKG" ]; then
         echo "Flat configuration package not implemented"
         exit 1
     else
-        if [ -d "$CONFPKG/Contents/Resources/English.lproj" ]; then
-            eng_resources="$CONFPKG/Contents/Resources/English.lproj"
-        elif [ -d "$CONFPKG/Contents/Resources/en.lproj" ]; then
-            eng_resources="$CONFPKG/Contents/Resources/en.lproj"
-        else
-            echo "Can't find English.lproj or en.lproj in $CONFPKG/Contents/Resources"
-            exit 1
-        fi
-        CONFTITLE=`defaults read "$eng_resources/Description" IFPkgDescriptionTitle`
-        CONFDESC=`defaults read "$eng_resources/Description" IFPkgDescriptionDescription`
-        CONFID=`defaults read "$CONFPKG/Contents/Info" CFBundleIdentifier`
-        CONFSIZE=`defaults read "$CONFPKG/Contents/Info" IFPkgFlagInstalledSize`
-        CONFVERSION=`defaults read "$CONFPKG/Contents/Info" CFBundleShortVersionString`
-        CONFBASENAME=`basename "$CONFPKG"`
+        echo "Bundle-style configuration package not supported"
+        exit 1
+        #if [ -d "$CONFPKG/Contents/Resources/English.lproj" ]; then
+        #    eng_resources="$CONFPKG/Contents/Resources/English.lproj"
+        #elif [ -d "$CONFPKG/Contents/Resources/en.lproj" ]; then
+        #    eng_resources="$CONFPKG/Contents/Resources/en.lproj"
+        #else
+        #    echo "Can't find English.lproj or en.lproj in $CONFPKG/Contents/Resources"
+        #    exit 1
+        #fi
+        #CONFTITLE=`defaults read "$eng_resources/Description" IFPkgDescriptionTitle`
+        #CONFDESC=`defaults read "$eng_resources/Description" IFPkgDescriptionDescription`
+        #CONFID=`defaults read "$CONFPKG/Contents/Info" CFBundleIdentifier`
+        #CONFSIZE=`defaults read "$CONFPKG/Contents/Info" IFPkgFlagInstalledSize`
+        #CONFVERSION=`defaults read "$CONFPKG/Contents/Info" CFBundleShortVersionString`
+        #CONFBASENAME=`basename "$CONFPKG"`
     fi
     CONFOUTLINE="<line choice=\"config\"/>"
     CONFCHOICE="<choice id=\"config\" title=\"$CONFTITLE\" description=\"$CONFDESC\">