Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3667,10 +3667,13 @@ func runUpdateCLI() (err error) { //nolint:gocyclo
return fmt.Errorf("could not create temp file: %w", err)
}
_, err = io.Copy(outFile, respAsset.Body)
outFile.Close() //nolint:errcheck,gosec
if err != nil {
_ = outFile.Close()
return fmt.Errorf("could not write asset to disk: %w", err)
}
if err := outFile.Close(); err != nil {
return fmt.Errorf("could not finalize asset file: %w", err)
}

// Determine the expected binary name based on the OS.
binaryName := "matcha"
Expand Down Expand Up @@ -3707,10 +3710,12 @@ func runUpdateCLI() (err error) { //nolint:gocyclo
return fmt.Errorf("could not create binary file: %w", err)
}
if _, err := io.Copy(out, tr); err != nil { //nolint:gosec
out.Close() //nolint:errcheck,gosec
_ = out.Close()
return fmt.Errorf("could not extract binary: %w", err)
}
out.Close() //nolint:errcheck,gosec
if err := out.Close(); err != nil {
return fmt.Errorf("could not finalize extracted binary: %w", err)
}
if err := os.Chmod(binPath, 0755); err != nil { //nolint:gosec
return fmt.Errorf("could not make binary executable: %w", err)
}
Expand All @@ -3737,12 +3742,17 @@ func runUpdateCLI() (err error) { //nolint:gocyclo
return fmt.Errorf("could not create binary file: %w", err)
}
if _, err := io.Copy(out, rc); err != nil { //nolint:gosec
out.Close() //nolint:errcheck,gosec
rc.Close() //nolint:errcheck,gosec
_ = out.Close()
_ = rc.Close()
return fmt.Errorf("could not extract binary: %w", err)
}
out.Close() //nolint:errcheck,gosec
rc.Close() //nolint:errcheck,gosec
if err := out.Close(); err != nil {
_ = rc.Close()
return fmt.Errorf("could not finalize extracted binary: %w", err)
}
if err := rc.Close(); err != nil {
return fmt.Errorf("could not close zip entry: %w", err)
}
if err := os.Chmod(binPath, 0755); err != nil { //nolint:gosec
return fmt.Errorf("could not make binary executable: %w", err)
}
Expand Down
Loading