Fix macOS builds

This commit is contained in:
Xpl0itU 2023-07-20 12:22:09 +02:00
parent fff0948034
commit 4bb0066714
4 changed files with 11 additions and 4 deletions

View file

@ -25,6 +25,8 @@ jobs:
- name: Package - name: Package
run: | run: |
python3 data/create_bundle.py python3 data/create_bundle.py
mkdir -p out/WiiUDownloader.app/Contents/MacOS/lib/share/glib-2.0/schemas
cp /opt/homebrew/share/glib-2.0/schemas/* out/WiiUDownloader.app/Contents/MacOS/lib/share/glib-2.0/schemas
create-dmg \ create-dmg \
--volname "WiiUDownloader" \ --volname "WiiUDownloader" \
--window-pos 200 120 \ --window-pos 200 120 \

1
.gitignore vendored
View file

@ -7,3 +7,4 @@ gtitles.c
output/ output/
main main
*.a *.a
out/

View file

@ -3,6 +3,7 @@ package wiiudownloader
import ( import (
"fmt" "fmt"
"os" "os"
"path"
"github.com/cavaliergopher/grab/v3" "github.com/cavaliergopher/grab/v3"
) )
@ -30,15 +31,16 @@ func getDefaultCert(progressWindow *ProgressWindow, client *grab.Client) ([]byte
if len(cetkData) >= 0x350+0x300 { if len(cetkData) >= 0x350+0x300 {
return cetkData[0x350 : 0x350+0x300], nil return cetkData[0x350 : 0x350+0x300], nil
} }
if err := downloadFile(progressWindow, client, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/000500101000400a/cetk", "cetk"); err != nil { cetkDir := path.Join(os.TempDir(), "cetk")
if err := downloadFile(progressWindow, client, "http://ccs.cdn.c.shop.nintendowifi.net/ccs/download/000500101000400a/cetk", cetkDir); err != nil {
return nil, err return nil, err
} }
cetkData, err := os.ReadFile("cetk") cetkData, err := os.ReadFile(cetkDir)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if err := os.Remove("cetk"); err != nil { if err := os.Remove(cetkDir); err != nil {
return nil, err return nil, err
} }

View file

@ -254,7 +254,9 @@ func DownloadTitle(titleID string, outputDirectory string, doDecryption bool, pr
return err return err
} }
if err := checkContentHashes(outputDirectory, content, &cipherHashTree); err != nil { if err := checkContentHashes(outputDirectory, content, &cipherHashTree); err != nil {
fmt.Println(err) if progressWindow.cancelled {
break
}
return err return err
} }
} }