no more tmpdir

ryanycoleman · Mar 27, 2018 · a27b19f · a27b19f
1 parent c56c0f2
commit a27b19f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/lib/facter/profiles.rb b/lib/facter/profiles.rb
@@ -4,18 +4,12 @@
 
     require 'puppet/util/plist'
     require 'time'
-    require 'tmpdir'
 
     profiles = {}
 
     if Facter.value(:os)['release']['major'].to_i >= 12
 
-      path = Dir.mktmpdir + '/profiles.plist'
-
-      # why????
-      Facter::Util::Resolution.exec(['/usr/bin/profiles', '-C', '-o', path].join(' '))
-
-      plist = Puppet::Util::Plist.read_plist_file(path)
+      plist = Puppet::Util::Plist.parse_plist(Facter::Util::Resolution.exec(['/usr/bin/profiles', '-C', '-o', 'stdout-xml'].join(' ')))
 
       if plist.key?('_computerlevel')
         for item in plist['_computerlevel']

diff --git a/lib/puppet/provider/profile_manager/macos.rb b/lib/puppet/provider/profile_manager/macos.rb
@@ -1,5 +1,4 @@
 require 'puppet/util/plist'
-require 'tmpdir'
 
 Puppet::Type.type(:profile_manager).provide :macos do
   desc 'Provides management of mobileconfig profiles on macOS.'
@@ -61,12 +60,10 @@ def writereceipt
   end
 
   def getinstalledstate
-    # profiles will only write to a nonexistant file, so we make a temp dir for it to write to.
-    path = Dir.mktmpdir + '/profiles.plist'
 
-    Puppet::Util::Execution.execute(['/usr/bin/profiles', '-C', '-o', path])
+    Puppet::Util::Execution.execute(['/usr/bin/profiles', '-C', '-o', 'stdout-xml'])
 
-    plist = Puppet::Util::Plist.read_plist_file(path)
+    plist = Puppet::Util::Plist.parse_plist(Puppet::Util::Execution.execute(['/usr/bin/profiles', '-C', '-o', 'stdout-xml']))
 
     if plist.key?('_computerlevel')
       for item in plist['_computerlevel']