hackmac 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9d92b598d1491d29dbfe3fc233afebf212f845297bcb58026f73036b3a26d2f
-  data.tar.gz: c29591587e204886e4ffcb9620d47d354b46f6ca8034f4f06d3f17d3bbb9813f
+  metadata.gz: 4ad8e3378122361187eaf1d6691ff4526382f521e8fb27f6097b2fda30ca7de9
+  data.tar.gz: 6ced7ebfe46a8e0cd6717952052fd030a0ae8de0581c0863ce3d7d5f35754a02
 SHA512:
-  metadata.gz: 74188b13a351404be04e3b4775a79a8cc58658a50811bd2cc440834aeef694cb83b51c8574f937e48f437cf7ac36ed3ceef1f8c7c21f03e08da791239696303a
-  data.tar.gz: ad5e1ead84f3a83cf19a6ecf917c3356622b3595d0f61a5966dea4eec6164d67dc1cbc59e4b115604802b24a33fb756cc1a001cda46633b7f22536fcf8c2bbbc
+  metadata.gz: c37fa57e337228bb7b4ed3980e9cb442e1ee6e5e60cb69e8a276fcff126ba1b220a2f548396897a8e25a8db622902be5f6fcc6a839930d67c8ce1e7bb780bdba
+  data.tar.gz: '09f715b888e62586f0ccde586c745474d3c77c695f26e3d4979f26f0269a997773827cb8c2062bcf732b1567b5329988bd9af6104f728163dc99f29064cb3d07'

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.1.0

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

@@ -28,8 +28,9 @@ 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}
   x %{git remote add origin #{$config.efi.source.inspect}}
   x %{git pull origin master}

data/hackmac.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.0.3 ruby lib
+# stub: hackmac 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.0.3"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   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

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.3'
+  VERSION         = '1.1.0'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Florian Frank
@@ -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