hackmac 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dae507a076b03ecde620eb64b1bda455e6a91ee8057978163e0622be9662594
-  data.tar.gz: 802683ffdf1d27f07c3d4dde01758241d4f01f4807976f76bd56262ae5c6ac39
+  metadata.gz: 8a4022d9645a534a9b141079da3c6121d13b9b5a25d4e0e29bba7ce7b91146ac
+  data.tar.gz: b5071b21969668dcbd888dc1140c4b6ecc3ec4d95c4a78066a842344e1d7ced8
 SHA512:
-  metadata.gz: b91aa703243c41d47fcf0c30f44abf1e59572111156ecfc664b778eb6d42172563fdb055d920d91fad3d09f4cbfb8a6f04a969dd235326b42c7f49a6afa3c964
-  data.tar.gz: 5857321e7be7f6b83569650648dca1f3c88cad2e77b9762570b33cbd9f3a8af2286db2a260b0ce1a2604645be9e204114e22e871e74c20910a5b3f1cb506c5d7
+  metadata.gz: e609a275e5e1e70105dec55074f0b52a8ecd1976031c1c252aaf82a0ba1e0e755483e1bfb98393e0cc2de6f8823679c003cb3703e299f5203739842a343919d9
+  data.tar.gz: bf5b34a5a8cc4c336eedb1a0e2c1bbd51de7ddf4ff384170c9dfca679acbcdc0a7de676d50971b17319505b64aae36bf3d0da100187ce76b15b3d52fc872a8cf

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/bin/usb

@@ -10,17 +10,10 @@ dev = ARGV.shift or fail "need usb device"
 
 dev = File.basename(dev)
 
-mountpoint = '/Volumes/USB'
-mountpoint_efi = '/Volumes/USB_EFI'
-
-if File.directory?(mountpoint)
-  puts " *** #{mountpoint} already mounted!".red
-  exit 1
-end
-
-if File.directory?(mountpoint_efi)
-  puts " *** #{mountpoint_efi} already mounted!".red
-  exit 1
+mountpoint     = $config.usb.mp
+mountpoint_efi = '/Volumes/%s' % $config.devices.usb.name
+unless File.exist?($config.usb.os)
+  fail "Cannot find #{$config.usb.os.inspect}!"
 end
 
 ask("Really erase #{dev.inspect} and install #{$config.usb.os.inspect}? (y/n) ") or exit
@@ -31,9 +24,11 @@ x %{sudo "#{$config.usb.os}/Contents/Resources/createinstallmedia" --volume #{mo
 
 x %{sudo mkdir -p #{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}
+  x %{git branch --set-upstream-to=origin/master}
 end

data/hackmac.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.1.2 ruby lib
+# stub: hackmac 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   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-10-06"
+  s.date = "2023-04-23"
   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/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.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/hackmac.yml".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.17".freeze
+  s.rubygems_version = "3.3.26".freeze
   s.summary = "Some useful tools for working with a Hackintosh".freeze
 
   if s.respond_to? :specification_version then

data/lib/hackmac/config.rb

@@ -8,58 +8,7 @@ module Hackmac
     extend FileUtils
     extend ComplexConfig::Provider::Shortcuts
 
-    DEFAULT = <<~end
-      ---
-      efi:
-        source: 'storage.gate.ping.de:/git/EFI-hacmaxi.git'
-      usb:
-        os: '/Applications/Install macOS Monterey.app'
-      devices:
-        main:
-          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/OC/Kexts'
-        sources:
-          AppleALC:
-            github: 'acidanthera/AppleALC'
-          IntelMausi:
-            github: 'acidanthera/IntelMausi'
-          Lilu:
-            github: 'acidanthera/Lilu'
-          #USBInjectAll:
-          #  github: 'Sniki/OS-X-USB-Inject-All'
-          VirtualSMC:
-            github: 'acidanthera/VirtualSMC'
-            debug: false
-            plugins:
-              - SMCProcessor
-              - SMCSuperIO
-          BrcmPatchRAM2:
-            github: 'acidanthera/BrcmPatchRAM'
-            plugins:
-              - BrcmFirmwareData
-          WhateverGreen:
-            github: 'acidanthera/WhateverGreen'
-          LucyRTL8125Ethernet:
-            github: 'Mieze/LucyRTL8125Ethernet'
-    end
+    DEFAULT = File.read(File.join(File.dirname(__FILE__), 'hackmac.yml'))
 
     def self.load(path: ENV.fetch('CONFIG_PATH', '~/.config/hackmac/hackmac.yml'))
       path = Pathname.new(path).expand_path

data/lib/hackmac/hackmac.yml

@@ -0,0 +1,56 @@
+---
+efi:
+  source: 'storage.gate.ping.de:/git/EFI-hacmaxi.git'
+usb:
+  os: '/Volumes/Install macOS Monterey/Install macOS Monterey.app'
+  mp: '/Volumes/USB'
+devices:
+  main:
+    name: 'OS_EFI'
+  backup:
+    name: 'BACKUP_EFI'
+  usb:
+    name: '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/OC/Kexts'
+  sources:
+    AppleALC:
+      github: 'acidanthera/AppleALC'
+    #IntelMausi:
+    #  github: 'acidanthera/IntelMausi'
+    Lilu:
+      github: 'acidanthera/Lilu'
+    #USBInjectAll:
+    #  github: 'Sniki/OS-X-USB-Inject-All'
+    VirtualSMC:
+      github: 'acidanthera/VirtualSMC'
+      debug: false
+      plugins:
+        - SMCProcessor
+        - SMCSuperIO
+    BrcmPatchRAM2:
+      github: 'acidanthera/BrcmPatchRAM'
+      plugins:
+        - BrcmFirmwareData
+    WhateverGreen:
+      github: 'acidanthera/WhateverGreen'
+    #LucyRTL8125Ethernet:
+    #  github: 'Mieze/LucyRTL8125Ethernet'
+    USBToolBox:
+      github: 'USBToolBox/kext'
+

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '1.1.2'
+  VERSION         = '1.2.0'
   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.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -174,6 +174,7 @@ files:
 - lib/hackmac/config.rb
 - lib/hackmac/disks.rb
 - lib/hackmac/github_source.rb
+- lib/hackmac/hackmac.yml
 - lib/hackmac/kext.rb
 - lib/hackmac/kext_upgrader.rb
 - lib/hackmac/oc.rb
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.17
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Some useful tools for working with a Hackintosh