hackmac 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 923c3844c934086f3e46c41d695766a8198515d02f75894afa90912b87428b86
-  data.tar.gz: c022882b0fdfa41fba34d6a6e39031cfb6df6fe0107ae31232d3e0c91ae9eb33
+  metadata.gz: b9d92b598d1491d29dbfe3fc233afebf212f845297bcb58026f73036b3a26d2f
+  data.tar.gz: c29591587e204886e4ffcb9620d47d354b46f6ca8034f4f06d3f17d3bbb9813f
 SHA512:
-  metadata.gz: 755e5d0e38d23b72951b2d17a44d320ae7423de56b2506dc85bef8409df8530000bd6f11d18a7005cd2da492cd3c6c7057c17ed746dfa1b035645a4a2e20c80c
-  data.tar.gz: 7346a101b0798408a94445dd7f1f72d28b904b1b677f4077f819966b28f77f9004bc3271eab6e27286a67ce51c9b681372d2aca4703952d841f093c5f00d1571
+  metadata.gz: 74188b13a351404be04e3b4775a79a8cc58658a50811bd2cc440834aeef694cb83b51c8574f937e48f437cf7ac36ed3ceef1f8c7c21f03e08da791239696303a
+  data.tar.gz: ad5e1ead84f3a83cf19a6ecf917c3356622b3595d0f61a5966dea4eec6164d67dc1cbc59e4b115604802b24a33fb756cc1a001cda46633b7f22536fcf8c2bbbc

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.3

data/bin/usb

@@ -25,6 +25,8 @@ ask("Really erase #{dev.inspect} and install #{$config.usb.os.inspect}? (y/n) ")
 
 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}}
 cd mountpoint_efi do
@@ -32,5 +34,3 @@ cd mountpoint_efi do
   x %{git remote add origin #{$config.efi.source.inspect}}
   x %{git pull origin master}
 end
-
-x %{sudo "#{$config.usb.os}/Contents/Resources/createinstallmedia" --volume #{mountpoint.inspect} --nointeraction}

data/hackmac.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.0.0 ruby lib
+# stub: hackmac 1.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.0.0"
+  s.version = "1.0.3"
 
   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-25"
+  s.date = "2022-05-26"
   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]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   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.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.13".freeze
+  s.rubygems_version = "3.3.14".freeze
   s.summary = "Some useful tools for working with a Hackintosh".freeze
 
   if s.respond_to? :specification_version then

data/lib/hackmac/config.rb

@@ -11,19 +11,31 @@ module Hackmac
     DEFAULT = <<~end
       ---
       efi:
-        source: 'https://github.com/flori/EFI-some.git'
+        source: 'storage.gate.ping.de:/git/EFI-hacmaxi.git'
       usb:
-        os: '/Applications/Install macOS Mojave.app'
+        os: '/Applications/Install macOS Monterey.app'
       devices:
         main:
-          name: 'OSX_EFI'
+          name: 'EFI'
         backup:
           name: 'BACKUP_EFI'
       github:
         user: null
         access_token: null
+      oc:
+        efi_path: 'EFI'
+        source:
+          github: 'acidanthera/OpenCorePkg'
+          debug: true
+        install_path: 'X64/EFI'
+        files:
+          - 'BOOT/BOOTx64.efi'
+          - 'OC/OpenCore.efi'
+          - 'OC/Drivers/OpenHfsPlus.efi'
+          - 'OC/Drivers/OpenRuntime.efi'
+          - 'OC/Tools/OpenShell.efi'
       kext:
-        efi_path: 'EFI/CLOVER/kexts/Other'
+        efi_path: 'EFI/OC/Kexts'
         sources:
           AppleALC:
             github: 'acidanthera/AppleALC'
@@ -45,6 +57,8 @@ module Hackmac
               - BrcmFirmwareData
           WhateverGreen:
             github: 'acidanthera/WhateverGreen'
+          LucyRTL8125Ethernet:
+            github: 'Mieze/LucyRTL8125Ethernet'
     end
 
     def self.load(path: ENV.fetch('CONFIG_PATH', '~/.config/hackmac/hackmac.yml'))
@@ -52,7 +66,7 @@ module Hackmac
       mkdir_p path.dirname
       ComplexConfig::Provider.config_dir = path.dirname
       unless path.exist?
-        File.secure_write(path, DEFAULT)
+        File.secure_write(path.to_s, DEFAULT)
       end
       puts "Loading config from #{path.to_s.inspect}."
       ComplexConfig::Provider[path.basename.to_s.sub(/\..*?\z/, '')]

data/lib/hackmac/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackmac
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.13
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: Some useful tools for working with a Hackintosh