Skip to content

Commit 7bcd971

Browse files
authored
Merge pull request #8 from andrew-field/use-existing-archiver-function
Use existing archiver function
2 parents 6fc524e + faacb3c commit 7bcd971

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

main.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,6 @@ func fixPermissions(root string) error {
275275
}
276276

277277
func downloadAndInstall(dl *GoDownload) error {
278-
unpacker, err := archiver.ByExtension(dl.Filename)
279-
if err != nil {
280-
return fmt.Errorf("don't know how to unpack %s: %v", dl.Filename, err)
281-
}
282-
u, ok := unpacker.(archiver.Unarchiver)
283-
if !ok {
284-
return fmt.Errorf("format specified by source filename is not an archive format: %s (%T)", dl.Filename, unpacker)
285-
}
286278
tmpfile, shasum, err := downloadFile(dl)
287279
if err != nil {
288280
return fmt.Errorf("download failed: %v", err)
@@ -305,7 +297,7 @@ func downloadAndInstall(dl *GoDownload) error {
305297
return fmt.Errorf("couldn't remove gocache version in %s: %v", gocachedir, err)
306298
}
307299
}
308-
if err = u.Unarchive(tmpfile, *destGoDir); err != nil {
300+
if err = archiver.Unarchive(tmpfile, *destGoDir); err != nil {
309301
return fmt.Errorf("can't unpack %s to %s: %v", tmpfile, godir, err)
310302
}
311303
if _, err = os.Stat(godir); err != nil {

0 commit comments

Comments
 (0)