hackmac 1.0.4 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55520e0e9ede7e3676120e1657126cc2f856633068d9194f1f59a56c05b6a729
-  data.tar.gz: d3b09585088903ea1d7323dfbc6149cef529d622a2c8e8457ca375b4706c05fd
+  metadata.gz: 3ce0745e80847b254926b937402d57d99c939479b6091f6066f96efa7ecf9961
+  data.tar.gz: 84f500bbf84ae66f28ec84dedccd1fb83a99fc496548c07d93f0a63d5008051f
 SHA512:
-  metadata.gz: e8e440e3057b442fe2984ef5a9807d224fd06a9dec4a4095f84d35e429e4e542d7d384def34b88dfe53d4405c61984e446bcdc12a664dad40733e4ac24b0cb79
-  data.tar.gz: bd13601b56152580fd2abb129e4ef01d17207383ecbf033a2f143ea9f9184e75a224837d3f06d65fd4545055d9562d573615efc3ab2a024ef9e79a60e850a787
+  metadata.gz: c6b659a558cc400b5d5194347b5b90c78685ad1350d5f01c0df014853072777c97f7f3a11b0f6be97d46c21e1f1c493e741d1ea60f4d3b87f99b60f4a4cf2a32
+  data.tar.gz: 1b727356e6770747646bb6d45d046c70fa636bf8fe48442adfeec549c9241c047d65eb9e66fde47b33652ae82b9f282263933d12fe62dd52784188e7a1fbb139

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.1.1

data/bin/efi

@@ -68,6 +68,10 @@ def usage
 
                  Upgrade OpenCore on this partition to newest version
 
+      oc_validate EFI partition
+
+                  validates config.plist in the given EFI
+
       diff        EFI partition
 
         argument DEVICE (defaults to #{default_dev})
@@ -187,6 +191,10 @@ when 'oc_upgrade'
   mdev = device_name(ARGV.shift)
   ocu = OCUpgrader.new(mdev: mdev, config: $config)
   ocu.perform
+when 'oc_validate'
+  mdev = device_name(ARGV.shift)
+  ocv = OCValidator.new(mdev: mdev, config: $config)
+  ocv.perform or exit 1
 else
   fail "don't know how to #{command}"
 end

data/bin/usb

@@ -8,6 +8,8 @@ $config = Hackmac::Config.load
 
 dev = ARGV.shift or fail "need usb device"
 
+dev = File.basename(dev)
+
 mountpoint = '/Volumes/USB'
 mountpoint_efi = '/Volumes/USB_EFI'
 
@@ -28,7 +30,7 @@ x %{diskutil partitionDisk #{dev.inspect} GPT JHFS+ "USB" 100%}
 x %{sudo "#{$config.usb.os}/Contents/Resources/createinstallmedia" --volume #{mountpoint.inspect} --nointeraction}
 
 x %{sudo mkdir -p #{mountpoint_efi.inspect}}
-x %{sudo mount -t msdos #{(dev + "s1").inspect} #{mountpoint_efi.inspect}}
+x %{sudo mount -t msdos #{('/dev/' + dev + 's1').inspect} #{mountpoint_efi.inspect}}
 cd mountpoint_efi do
   x %{sudo chown $USER .}
   x %{git init}

data/hackmac.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.0.4 ruby lib
+# stub: hackmac 1.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.0.4"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2022-05-26"
+  s.date = "2022-07-12"
   s.description = "This ruby gem provides some useful tools for working with a Hackintosh.".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["efi".freeze, "gfxmon".freeze, "usb".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
-  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "bin/usb".freeze, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/oc_validator.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
+  s.files = [".gitignore".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/efi".freeze, "bin/gfxmon".freeze, "bin/usb".freeze, "hackmac.gemspec".freeze, "lib/hackmac.rb".freeze, "lib/hackmac/asset_tools.rb".freeze, "lib/hackmac/config.rb".freeze, "lib/hackmac/disks.rb".freeze, "lib/hackmac/github_source.rb".freeze, "lib/hackmac/kext.rb".freeze, "lib/hackmac/kext_upgrader.rb".freeze, "lib/hackmac/oc.rb".freeze, "lib/hackmac/oc_upgrader.rb".freeze, "lib/hackmac/oc_validator.rb".freeze, "lib/hackmac/plist.rb".freeze, "lib/hackmac/url_download.rb".freeze, "lib/hackmac/utils.rb".freeze, "lib/hackmac/version.rb".freeze]
   s.homepage = "http://github.com/flori/hackmac".freeze
   s.rdoc_options = ["--title".freeze, "Hackmac - Some useful tools for working with a Hackintosh".freeze, "--main".freeze, "README.md".freeze]
-  s.rubygems_version = "3.3.14".freeze
+  s.rubygems_version = "3.3.17".freeze
   s.summary = "Some useful tools for working with a Hackintosh".freeze
 
   if s.respond_to? :specification_version then

data/lib/hackmac/oc_validator.rb

@@ -0,0 +1,34 @@
+module Hackmac
+  include Hackmac::AssetTools
+
+  class OCValidator
+    def initialize(mdev:, config:)
+      @config = config
+      mount_path   = Pathname.new('/Volumes').join(mdev)
+      @config_plist =
+        Pathname.new(mount_path).join(@config.oc.efi_path).join('OC/config.plist')
+    end
+
+    def perform
+      isolate do |dir|
+        oc = OC.new(config: @config)
+        name, data = oc.remote.download_asset
+        if name
+          File.secure_write(name, data)
+          decompress(name)
+          result = %x(Utilities/ocvalidate/ocvalidate #{@config_plist.to_s.inspect} 2>&1)
+          if $?.success?
+            STDERR.puts result
+            true
+          else
+            STDERR.puts "Validation has failed!", "", result
+            false
+          end
+          true
+        else
+          fail "#{oc} could not be downloaded"
+        end
+      end
+    end
+  end
+end

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '1.0.4'
+  VERSION         = '1.1.1'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/hackmac.rb

@@ -14,5 +14,6 @@ require 'hackmac/kext'
 require 'hackmac/kext_upgrader'
 require 'hackmac/oc'
 require 'hackmac/oc_upgrader'
+require 'hackmac/oc_validator'
 require 'hackmac/config'
 require 'hackmac/utils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -154,6 +154,7 @@ extra_rdoc_files:
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/oc.rb
 - lib/hackmac/oc_upgrader.rb
+- lib/hackmac/oc_validator.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/url_download.rb
 - lib/hackmac/utils.rb
@@ -177,6 +178,7 @@ files:
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/oc.rb
 - lib/hackmac/oc_upgrader.rb
+- lib/hackmac/oc_validator.rb
 - lib/hackmac/plist.rb
 - lib/hackmac/url_download.rb
 - lib/hackmac/utils.rb
@@ -203,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: Some useful tools for working with a Hackintosh