iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common: style

This commit is contained in:
Mitchell Hashimoto 2013-08-03 13:34:48 -07:00
parent a1668a73dc
commit e2c667101c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/config.go
View File

@ -74,8 +74,8 @@ func DownloadableURL(original string) (string, error) {
}
if url.Scheme == "file" {
// For Windows absolute file paths, remove leading /
// prior to processing
// For Windows absolute file paths, remove leading / prior to processing
// since net/url turns "C:/" into "/C:/"
if runtime.GOOS == "windows" && url.Path[0] == '/' {
url.Path = url.Path[1:len(url.Path)]
}

11
common/download.go
View File

@ -107,12 +107,11 @@ func (d *DownloadClient) Get() (string, error) {
// Files when we don't copy the file are special cased.
var finalPath string
if url.Scheme == "file" && !d.config.CopyFile {
// Remove forward slash on absolute Windows file URLs
// Before processing
if runtime.GOOS == "windows" && url.Path[0] == '/' {
finalPath = url.Path[1:len(url.Path)]
} else {
finalPath = url.Path
finalPath = url.Path
// Remove forward slash on absolute Windows file URLs before processing
if runtime.GOOS == "windows" && finalPath[0] == '/' {
finalPath = finalPath[1:len(finalPath)]
}
} else {
finalPath = d.config.TargetPath