Skip to content

Commit

Permalink
Fixed compilation issues and updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dids
Dids committed Sep 10, 2020
1 parent 20c3074 commit 0e3afe1
Show file tree
Hide file tree
Showing 159 changed files with 7,176 additions and 8,605 deletions.
39 changes: 21 additions & 18 deletions cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,13 +399,14 @@ var rootCmd = &cobra.Command{
// log.Fatal("Error: Failed to update extra EFI drivers (download AptioFixPkg): ", err)
// }
// defer os.RemoveAll(os.TempDir() + "AptioFixPkg.zip")

os.RemoveAll(os.TempDir() + "OcQuirks.zip")
if err := util.DownloadFile(getGitHubReleaseLink("https://api.github.com/repos/ReddestDream/OcQuirks/releases/latest", "browser_download_url.*.zip"), os.TempDir()+"OcQuirks.zip"); err != nil {
log.Fatal("Error: Failed to update extra EFI drivers (download OcQuirks): ", err)
}
log.Debug("Downloaded OcQuirks to ", os.TempDir()+"OcQuirks.zip")
defer os.RemoveAll(os.TempDir() + "OcQuirks.zip")

// NOTE: Disabled as Clover now includes OcQuirks on its own
// os.RemoveAll(os.TempDir() + "OcQuirks.zip")
// if err := util.DownloadFile(getGitHubReleaseLink("https://api.github.com/repos/ReddestDream/OcQuirks/releases/latest", "browser_download_url.*.zip"), os.TempDir()+"OcQuirks.zip"); err != nil {
// log.Fatal("Error: Failed to update extra EFI drivers (download OcQuirks): ", err)
// }
// log.Debug("Downloaded OcQuirks to ", os.TempDir()+"OcQuirks.zip")
// defer os.RemoveAll(os.TempDir() + "OcQuirks.zip")

// Extract Acidanthera drivers
// os.RemoveAll(os.TempDir() + "AppleSupportPkg")
Expand All @@ -420,12 +421,13 @@ var rootCmd = &cobra.Command{
// }
// defer os.RemoveAll(os.TempDir() + "AptioFixPkg")

os.RemoveAll(os.TempDir() + "OcQuirks")
if err := archiver.Unarchive(os.TempDir()+"OcQuirks.zip", os.TempDir()+"OcQuirks"); err != nil {
log.Fatal("Error: Failed to update extra EFI drivers (unzip OcQuirks): ", err)
}
log.Debug("Unzipped OcQuirks to ", os.TempDir()+"OcQuirks")
defer os.RemoveAll(os.TempDir() + "OcQuirks")
// NOTE: Disabled as Clover now includes OcQuirks on its own
// os.RemoveAll(os.TempDir() + "OcQuirks")
// if err := archiver.Unarchive(os.TempDir()+"OcQuirks.zip", os.TempDir()+"OcQuirks"); err != nil {
// log.Fatal("Error: Failed to update extra EFI drivers (unzip OcQuirks): ", err)
// }
// log.Debug("Unzipped OcQuirks to ", os.TempDir()+"OcQuirks")
// defer os.RemoveAll(os.TempDir() + "OcQuirks")

// Copy ApfsDriverLoader.efi
// if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/ApfsDriverLoader.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI/ApfsDriverLoader.efi"); err != nil {
Expand Down Expand Up @@ -457,13 +459,14 @@ var rootCmd = &cobra.Command{
// if err := util.CopyFile(os.TempDir()+"AptioFixPkg/Drivers/AptioMemoryFix.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI/AptioMemoryFix.efi"); err != nil {
// log.Fatal("Error: Failed to update extra EFI drivers (copy AptioMemoryFix.efi): ", err)
// }


// NOTE: Disabled as Clover now includes OcQuirks on its own
// Copy everything from OcQuirks
// if err := util.CopyFile(os.TempDir()+"OcQuirks/OcQuirks/OcQuirks.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI/OcQuirks.efi"); err != nil {
if err := util.CopyFiles(os.TempDir()+"OcQuirks/OcQuirks", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI"); err != nil {
// if err := util.CopyFiles(os.TempDir()+"OcQuirks", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI"); err != nil {
log.Fatal("Error: Failed to update extra EFI drivers (copy OcQuirks): ", err)
}
// if err := util.CopyFiles(os.TempDir()+"OcQuirks/OcQuirks", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI"); err != nil {
// // if err := util.CopyFiles(os.TempDir()+"OcQuirks", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI"); err != nil {
// log.Fatal("Error: Failed to update extra EFI drivers (copy OcQuirks): ", err)
// }

// Copy FwRuntimeServices.efi (do this after OcQuirks)
// if err := util.CopyFile(os.TempDir()+"AppleSupportPkg/Drivers/FwRuntimeServices.efi", util.GetCloverPath()+"/CloverPackage/CloverV2/EFI/CLOVER/drivers/UEFI/FwRuntimeServices.efi"); err != nil {
Expand Down
23 changes: 11 additions & 12 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ go 1.12
require (
github.com/blang/semver v3.5.1+incompatible
github.com/briandowns/spinner v1.11.1
github.com/common-nighthawk/go-figure v0.0.0-20190529165535-67e0ed34491a
github.com/common-nighthawk/go-figure v0.0.0-20200609044655-c4b36f998cf2
github.com/dsnet/compress v0.0.1 // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/frankban/quicktest v1.4.0 // indirect
github.com/gobuffalo/packr/v2 v2.8.0
github.com/golang/protobuf v1.4.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/karrick/godirwalk v1.15.6 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/mholt/archiver v3.1.1+incompatible
github.com/mitchellh/go-homedir v1.1.0
github.com/nsf/termbox-go v0.0.0-20200418040025-38ba6e5628f1
Expand All @@ -24,19 +24,18 @@ require (
github.com/onsi/gomega v1.5.0 // indirect
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
github.com/rhysd/go-github-selfupdate v1.2.2
github.com/rogpeppe/go-internal v1.6.0 // indirect
github.com/rogpeppe/go-internal v1.6.2 // indirect
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5 // indirect
github.com/ulikunitz/xz v0.5.7 // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
github.com/x-cray/logrus-prefixed-formatter v0.5.2
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect
golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 // indirect
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 // indirect
golang.org/x/tools v0.0.0-20200909210914-44a2922940c2 // indirect
google.golang.org/appengine v1.6.6 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0
Expand Down
Loading

0 comments on commit 0e3afe1

Please sign in to comment.