composer.rb in ruby-jss-1.6.0b1

- old
+ new

@@ -124,11 +124,11 @@
       ### (see 'man pkgbuild' for more info)
       ###
       ###
       comp_plist_out = Pathname.new "/tmp/#{PKG_BUNDLE_ID_PFX}-#{pkg_filename}.plist"
       system "#{PKGBUILD} --analyze --root '#{root}' '#{comp_plist_out}'"
-      comp_plist = Plist.parse_xml comp_plist_out.read
+      comp_plist = JSS.parse_plist comp_plist_out
 
       ### if the plist is empty, there are no bundles in the pkg
       if comp_plist[0].nil?
         comp_plist_arg = ''
       else
@@ -139,10 +139,10 @@
           bndl['BundleIsVersionChecked'] = false
           bndl['BundleIsRelocatable'] = false
           bndl['BundleHasStrictIdentifier'] = false
         end
         ### write out the edits
-        comp_plist_out.open('w') { |f| f.write comp_plist.to_plist }
+        comp_plist_out.open('w') { |f| f.write JSS.xml_plist_from(comp_plist) }
         comp_plist_arg = "--component-plist '#{comp_plist_out}'"
       end
 
       ### now build the pkg
       begin