@@ -49,15 +49,17 @@ func DownloadTool(toolRelease *cores.ToolRelease) (*paths.Path, error) {
49
49
"tools" ,
50
50
toolRelease .Tool .Name ,
51
51
toolRelease .Version .String ())
52
- installDir .MkdirAll ()
52
+ if err := installDir .MkdirAll (); err != nil {
53
+ logrus .Error (err )
54
+ return nil , err
55
+ }
53
56
downloadsDir := globals .FwUploaderPath .Join ("downloads" )
54
57
archivePath := downloadsDir .Join (resource .ArchiveFileName )
55
- archivePath .Parent ().MkdirAll ()
56
- if err := archivePath .WriteFile (nil ); err != nil {
58
+ if err := archivePath .Parent ().MkdirAll (); err != nil {
57
59
logrus .Error (err )
58
60
return nil , err
59
61
}
60
- d , err := downloader .Download (archivePath .String (), resource .URL )
62
+ d , err := downloader .Download (archivePath .String (), resource .URL , downloader . NoResume )
61
63
if err != nil {
62
64
logrus .Error (err )
63
65
return nil , err
@@ -80,12 +82,11 @@ func DownloadFirmware(firmware *firmwareindex.IndexFirmware) (*paths.Path, error
80
82
firmware .Module ,
81
83
firmware .Version .String (),
82
84
path .Base (firmware .URL ))
83
- firmwarePath .Parent ().MkdirAll ()
84
- if err := firmwarePath .WriteFile (nil ); err != nil {
85
+ if err := firmwarePath .Parent ().MkdirAll (); err != nil {
85
86
logrus .Error (err )
86
87
return nil , err
87
88
}
88
- d , err := downloader .Download (firmwarePath .String (), firmware .URL )
89
+ d , err := downloader .Download (firmwarePath .String (), firmware .URL , downloader . NoResume )
89
90
if err != nil {
90
91
logrus .Error (err )
91
92
return nil , err
@@ -111,12 +112,11 @@ func DownloadSketch(loader *firmwareindex.IndexSketch) (*paths.Path, error) {
111
112
sketchPath := globals .FwUploaderPath .Join (
112
113
"sketch" ,
113
114
path .Base (loader .URL ))
114
- sketchPath .Parent ().MkdirAll ()
115
- if err := sketchPath .WriteFile (nil ); err != nil {
115
+ if err := sketchPath .Parent ().MkdirAll (); err != nil {
116
116
logrus .Error (err )
117
117
return nil , err
118
118
}
119
- d , err := downloader .Download (sketchPath .String (), loader .URL )
119
+ d , err := downloader .Download (sketchPath .String (), loader .URL , downloader . NoResume )
120
120
if err != nil {
121
121
logrus .Error (err )
122
122
return nil , err
@@ -232,7 +232,7 @@ func DownloadIndex(indexURL string) (*paths.Path, error) {
232
232
233
233
// Download index
234
234
tmpGZIndex := tempDir .Join ("index.gz" )
235
- d , err := downloader .Download (tmpGZIndex .String (), indexArchiveURL .String ())
235
+ d , err := downloader .Download (tmpGZIndex .String (), indexArchiveURL .String (), downloader . NoResume )
236
236
if err != nil {
237
237
return nil , fmt .Errorf ("downloading index %s: %s" , indexURL , err )
238
238
}
@@ -253,11 +253,10 @@ func DownloadIndex(indexURL string) (*paths.Path, error) {
253
253
}
254
254
tmpSignature := tempDir .Join ("index.json.sig" )
255
255
256
- d , err = downloader .Download (tmpSignature .String (), signatureURL .String ())
256
+ d , err = downloader .Download (tmpSignature .String (), signatureURL .String (), downloader . NoResume )
257
257
if err != nil {
258
258
return nil , fmt .Errorf ("downloading index signature %s: %s" , signatureURL , err )
259
259
}
260
- indexSigPath := globals .FwUploaderPath .Join (path .Base (signatureURL .Path ))
261
260
if err := Download (d ); err != nil || d .Error () != nil {
262
261
return nil , fmt .Errorf ("downloading index signature %s: %s %s" , indexArchiveURL , d .Error (), err )
263
262
}
@@ -267,6 +266,7 @@ func DownloadIndex(indexURL string) (*paths.Path, error) {
267
266
if err := globals .FwUploaderPath .MkdirAll (); err != nil { //does not overwrite if dir already present
268
267
return nil , fmt .Errorf ("can't create data directory %s: %s" , globals .FwUploaderPath , err )
269
268
}
269
+ indexSigPath := globals .FwUploaderPath .Join (path .Base (signatureURL .Path ))
270
270
indexPath := globals .FwUploaderPath .Join (path .Base (strings .ReplaceAll (indexArchiveURL .Path , ".gz" , "" )))
271
271
if err := tmpIndex .CopyTo (indexPath ); err != nil { //does overwrite
272
272
return nil , fmt .Errorf ("saving downloaded index %s: %s" , indexArchiveURL , err )
0 commit comments