hackmac 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce0745e80847b254926b937402d57d99c939479b6091f6066f96efa7ecf9961
-  data.tar.gz: 84f500bbf84ae66f28ec84dedccd1fb83a99fc496548c07d93f0a63d5008051f
+  metadata.gz: 16dfe86be3058bf95655939db99c8f97c5f63355bef259ffda9330af7566693e
+  data.tar.gz: 164f8de22bfd8b6b0afefb04210fc3fb2ea4bbef283beb11b35796c4ac7b8e3c
 SHA512:
-  metadata.gz: c6b659a558cc400b5d5194347b5b90c78685ad1350d5f01c0df014853072777c97f7f3a11b0f6be97d46c21e1f1c493e741d1ea60f4d3b87f99b60f4a4cf2a32
-  data.tar.gz: 1b727356e6770747646bb6d45d046c70fa636bf8fe48442adfeec549c9241c047d65eb9e66fde47b33652ae82b9f282263933d12fe62dd52784188e7a1fbb139
+  metadata.gz: 942b49f6c2f03c99ea0d8743537aa66b32dc4240e1a4790639099493853d166681323fc3c175268005dc80d9068c9c95fbf084e9a8d42b5832347a764f0ba17c
+  data.tar.gz: 5ee4aaa820530ed28627be8eea8dfc29bf7ed4eacfa3bdfaf4d43de655f969026c6d425e3a208571eea7eeebf717baf960f1bda75f8c911bcf9249c762f05195

data/Rakefile

@@ -23,5 +23,5 @@ GemHadar do
   dependency  'plist'
   dependency  'tabulo'
   dependency  'search_ui'
-  development_dependency 'byebug'
+  development_dependency 'debug'
 end

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.3

data/bin/efi

@@ -25,6 +25,8 @@ def usage
 
     Usage #{File.basename($0)} [command] [arguments]
 
+    Set CONFIG_PATH to the config file, e. g. ~/.config/hackmac/foobar.yml
+
     Commands are
 
       help        this help

data/bin/usb

@@ -10,18 +10,8 @@ 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
-end
+mountpoint     = $config.usb.mp
+mountpoint_efi = '/Volumes/%s' % $config.devices.usb.name
 
 ask("Really erase #{dev.inspect} and install #{$config.usb.os.inspect}? (y/n) ") or exit
 
@@ -31,6 +21,7 @@ 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}

data/hackmac.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: hackmac 1.1.1 ruby lib
+# stub: hackmac 1.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hackmac".freeze
-  s.version = "1.1.1"
+  s.version = "1.1.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-07-12"
+  s.date = "2023-02-18"
   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
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :add_runtime_dependency then
     s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
-    s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
+    s.add_development_dependency(%q<debug>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
     s.add_runtime_dependency(%q<complex_config>.freeze, [">= 0"])
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.12.0"])
-    s.add_dependency(%q<byebug>.freeze, [">= 0"])
+    s.add_dependency(%q<debug>.freeze, [">= 0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
     s.add_dependency(%q<complex_config>.freeze, [">= 0"])

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/utils.rb

@@ -13,7 +13,7 @@ module Hackmac
 
     def x(cmd, verbose: true)
       prompt = cmd =~ /\A\s*sudo/ ? ?# : ?$
-      output = `#{cmd}`
+      output = `#{cmd} 2>&1`
       if $?.success?
         print "#{prompt} #{cmd}".green
         puts verbose ? "" : " >/dev/null".yellow

data/lib/hackmac/version.rb

@@ -1,6 +1,6 @@
 module Hackmac
   # Hackmac version
-  VERSION         = '1.1.1'
+  VERSION         = '1.1.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.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2023-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.12.0
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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