Skip to content

Commit

Permalink
update go modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@apprehensions
apprehensions committed Mar 31, 2024
1 parent 0e9794b commit 4db1db9
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion cmd/vinegar/binary.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type Binary struct {
Dir string
Prefix *wine.Prefix
Type clientsettings.BinaryType
Deploy *rbxbin.Deployment
Deploy rbxbin.Deployment

// Logging
Auth bool
Expand Down
10 changes: 3 additions & 7 deletions cmd/vinegar/binary_setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (b *Binary) FetchDeployment() error {
if b.Config.ForcedVersion != "" {
slog.Warn("Using forced deployment!", "guid", b.Config.ForcedVersion)

b.Deploy = &rbxbin.Deployment{
b.Deploy = rbxbin.Deployment{
Type: b.Type,
Channel: b.Config.Channel,
GUID: b.Config.ForcedVersion,
Expand Down Expand Up @@ -115,14 +115,10 @@ func (b *Binary) Install() error {
if err != nil {
return fmt.Errorf("fetch mirror: %w", err)
}
manif, err := netutil.Body(m.PackageManifest(b.Deploy))
pkgs, err := m.GetPackages(b.Deploy)
if err != nil {
return fmt.Errorf("fetch packages: %w", err)
}
pkgs, err := rbxbin.ParsePackages([]byte(manif))
if err != nil {
return fmt.Errorf("parse packages: %w", err)
}

// Prioritize smaller files first, to have less pressure
// on network and extraction
Expand Down Expand Up @@ -193,7 +189,7 @@ func (b *Binary) SetupPackages(pkgs *[]rbxbin.Package, m *rbxbin.Mirror) error {
}

if err := p.Verify(src); err != nil {
url := m.Package(b.Deploy, p.Name)
url := m.PackageURL(b.Deploy, p.Name)
slog.Info("Downloading package", "url", url, "path", src)

if err := netutil.Download(url, src); err != nil {
Expand Down
12 changes: 7 additions & 5 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
require (
gioui.org v0.5.0
github.com/altfoxie/drpc v0.0.0-20231214171500-0a4e3a3b1c53
github.com/apprehensions/rbxbin v0.0.0-20240308151735-386fce3d14ac
github.com/apprehensions/rbxweb v0.0.0-20240309193157-ac2821c3a715
github.com/apprehensions/wine v0.0.0-20240308151754-d5e6446351dc
github.com/apprehensions/rbxbin v0.0.0-20240331194455-628e3aed31ff
github.com/apprehensions/rbxweb v0.0.0-20240329184049-0bdedc184942
github.com/apprehensions/wine v0.0.0-20240312153031-d58fca03f2dc
github.com/folbricht/pefile v0.1.0
github.com/fsnotify/fsnotify v1.7.0
github.com/godbus/dbus/v5 v5.1.0
Expand All @@ -31,9 +31,11 @@ require (
github.com/go-text/typesetting v0.0.0-20231206174126-ce41cc83e028 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/otiai10/mint v1.6.3 // indirect
github.com/robloxapi/rbxdhist v0.6.0 // indirect
github.com/robloxapi/rbxver v0.3.0 // indirect
github.com/samber/lo v1.39.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/exp/shiny v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
golang.org/x/exp/shiny v0.0.0-20240325151524-a685a6edb6d8 // indirect
golang.org/x/image v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
Expand Down
26 changes: 14 additions & 12 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@ github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
github.com/altfoxie/drpc v0.0.0-20231214171500-0a4e3a3b1c53 h1:NcI4SrGv7yDhMRFc6SOQnmTvkOWya6WT/eXVjQoT+TA=
github.com/altfoxie/drpc v0.0.0-20231214171500-0a4e3a3b1c53/go.mod h1:vV4ApNpKIGN4PT5NYmWqw1IEIsFzqj0pspTUSltS+gk=
github.com/apprehensions/rbxbin v0.0.0-20240308151735-386fce3d14ac h1:j8V8/LaIRY54rzNyFrGunjZyebJj6SOzqoP7VHQsn0w=
github.com/apprehensions/rbxbin v0.0.0-20240308151735-386fce3d14ac/go.mod h1:FPEDrVuql3rsAsGTXnaIvl3GXQPDxvoSeuyaQKsIFsU=
github.com/apprehensions/rbxweb v0.0.0-20240308122818-8de3663e1d40 h1:YFMJMX3x/8B0VXbwA1M6JmkhtEt35VprZvj40AGRxkk=
github.com/apprehensions/rbxweb v0.0.0-20240308122818-8de3663e1d40/go.mod h1:F7WKRLrQxuRgfXxhwnlFJ059ZBMRxkXxvIhUxP4Qc5g=
github.com/apprehensions/rbxweb v0.0.0-20240309193157-ac2821c3a715 h1:mX1nybwzpK6lbSxUmIVhhtLtmGFQ5ABzSdIiNMBHvrM=
github.com/apprehensions/rbxweb v0.0.0-20240309193157-ac2821c3a715/go.mod h1:F7WKRLrQxuRgfXxhwnlFJ059ZBMRxkXxvIhUxP4Qc5g=
github.com/apprehensions/wine v0.0.0-20240308151754-d5e6446351dc h1:2/DdPTGUz7xuFsVUg+n4Rc/ETlbHELCRZZb3TKh7KEg=
github.com/apprehensions/wine v0.0.0-20240308151754-d5e6446351dc/go.mod h1:t54gBblDmNAdLoRNLKk/338+JQvCiyt6qS8EUpD3RYw=
github.com/apprehensions/rbxbin v0.0.0-20240331194455-628e3aed31ff h1:4faqIFS8+ti5Nb06j4iOj9fU4KdJrOmZQTmxIXwR8aU=
github.com/apprehensions/rbxbin v0.0.0-20240331194455-628e3aed31ff/go.mod h1:xQ/kfERoO1h8tCGp8z6EafN4TdEERb0sRO5fM/3bhKo=
github.com/apprehensions/rbxweb v0.0.0-20240329184049-0bdedc184942 h1:pNRoIKlv329La+msdHmJSPYYf1y4hY4s5ou2mEQDHqU=
github.com/apprehensions/rbxweb v0.0.0-20240329184049-0bdedc184942/go.mod h1:F7WKRLrQxuRgfXxhwnlFJ059ZBMRxkXxvIhUxP4Qc5g=
github.com/apprehensions/wine v0.0.0-20240312153031-d58fca03f2dc h1:JIbb+03WenrmxJn7RQwms1uUQTUGsRVauni3EzeAomE=
github.com/apprehensions/wine v0.0.0-20240312153031-d58fca03f2dc/go.mod h1:t54gBblDmNAdLoRNLKk/338+JQvCiyt6qS8EUpD3RYw=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/folbricht/pefile v0.1.0 h1:y9aMwgNlPO/iyp8Izll3Au4XNp7Fi7uDH8OKZ1Nl+lw=
Expand All @@ -46,17 +44,21 @@ github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/robloxapi/rbxdhist v0.6.0 h1:DH3hBwjgnJJyfuRQvJxkaX27V/EQP8/0KihW/9Ajo6Q=
github.com/robloxapi/rbxdhist v0.6.0/go.mod h1:Dv8zmWSygz0Qc8SIRxasJ8wlAIchvyifEVHrG3qwNXI=
github.com/robloxapi/rbxver v0.3.0 h1:ax3ndKtLiXNeYbGc56UEcPQYYMEr6heOfyRDfn+68lg=
github.com/robloxapi/rbxver v0.3.0/go.mod h1:mpM7UdZ2YyLq4gSVtWToeRQLUHNBcOfRGRjINbOi5vM=
github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
github.com/samber/slog-multi v1.0.2 h1:6BVH9uHGAsiGkbbtQgAOQJMpKgV8unMrHhhJaw+X1EQ=
github.com/samber/slog-multi v1.0.2/go.mod h1:uLAvHpGqbYgX4FSL0p1ZwoLuveIAJvBECtE07XmYvFo=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/exp/shiny v0.0.0-20240222234643-814bf88cf225 h1:5c1vh6Z0LHEVurVuFE5ElIYhjVG+nP7ZGFB3yx9yTVA=
golang.org/x/exp/shiny v0.0.0-20240222234643-814bf88cf225/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw=
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=
golang.org/x/exp/shiny v0.0.0-20240325151524-a685a6edb6d8 h1:GYlVE/zmuKm+XvR3nYWXZF0SaO2vvPX1Djy2LVOf+TU=
golang.org/x/exp/shiny v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
Expand Down

0 comments on commit 4db1db9

Please sign in to comment.