Use target directory for tmpdir

dpb587 · dpb587 · commit 4d04641341dd · 2020-02-20T13:30:06.000-08:00
diff --git a/cmd/gget/command.go b/cmd/gget/command.go
@@ -179,7 +179,9 @@ func (c *Command) Execute(_ []string) error {
 		} else {
 			steps = append(
 				steps,
-				&downloader.DownloadTmpfileInstaller{},
+				&downloader.DownloadTmpfileInstaller{
+					Tmpdir: filepath.Dir(localPath),
+				},
 			)
 		}
 
diff --git a/go.sum b/go.sum
@@ -17,6 +17,7 @@ github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASu
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
diff --git a/pkg/downloader/installer_tmpfile.go b/pkg/downloader/installer_tmpfile.go
@@ -24,7 +24,7 @@ func (dpi *DownloadTmpfileInstaller) GetProgressParams() (int64, decor.Decorator
 }
 
 func (dpi *DownloadTmpfileInstaller) GetWriter() (io.Writer, error) {
-	p, err := ioutil.TempFile(dpi.Tmpdir, "gget-tmpfile-*")
+	p, err := ioutil.TempFile(dpi.Tmpdir, ".gget-*")
 	if err != nil {
 		return nil, errors.Wrap(err, "creating tempfile")
 	}

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,9 @@ func (c *Command) Execute(_ []string) error {`
`179`	`179`	`} else {`
`180`	`180`	`steps = append(`
`181`	`181`	`steps,`
`182`		`- &downloader.DownloadTmpfileInstaller{},`
	`182`	`+ &downloader.DownloadTmpfileInstaller{`
	`183`	`+ Tmpdir: filepath.Dir(localPath),`
	`184`	`+ },`
`183`	`185`	`)`
`184`	`186`	`}`
`185`	`187`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func (dpi *DownloadTmpfileInstaller) GetProgressParams() (int64, decor.Decorator`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`func (dpi *DownloadTmpfileInstaller) GetWriter() (io.Writer, error) {`
`27`		`- p, err := ioutil.TempFile(dpi.Tmpdir, "gget-tmpfile-*")`
	`27`	`+ p, err := ioutil.TempFile(dpi.Tmpdir, ".gget-*")`
`28`	`28`	`if err != nil {`
`29`	`29`	`return nil, errors.Wrap(err, "creating tempfile")`
`30`	`30`	`}`