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

Merge pull request #240 from jasonberanek/windows-paths-fix 

common: Fix URL and Relative Windows file path support #235/#239
This commit is contained in:
Mitchell Hashimoto 2013-08-03 13:32:51 -07:00
parent 5b7d8fbc74 3fa5fa396a
commit a1668a73dc
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/config.go
View File

@ -7,6 +7,7 @@ import (
"net/url" "net/url"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"sort" "sort"
"strings" "strings"
) )
@ -73,6 +74,12 @@ func DownloadableURL(original string) (string, error) {
} }
if url.Scheme == "file" { if url.Scheme == "file" {
// For Windows absolute file paths, remove leading /
// prior to processing
if runtime.GOOS == "windows" && url.Path[0] == '/' {
url.Path = url.Path[1:len(url.Path)]
}
if _, err := os.Stat(url.Path); err != nil { if _, err := os.Stat(url.Path); err != nil {
return "", err return "", err
} }

9
common/download.go
View File

@ -14,6 +14,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"os" "os"
"runtime"
) )
// DownloadConfig is the configuration given to instantiate a new // DownloadConfig is the configuration given to instantiate a new
@ -106,7 +107,13 @@ func (d *DownloadClient) Get() (string, error) {
// Files when we don't copy the file are special cased. // Files when we don't copy the file are special cased.
var finalPath string var finalPath string
if url.Scheme == "file" && !d.config.CopyFile { if url.Scheme == "file" && !d.config.CopyFile {
finalPath = url.Path // 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
}
} else { } else {
finalPath = d.config.TargetPath finalPath = d.config.TargetPath