roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/bzzup: trim directory in the manifest entry path (#3299)

Browse Source
This commit is contained in:
Aron Fischer 2016-11-18 14:41:37 +01:00 committed by Felix Lange
parent 04edbb0703
commit 0d9a8207d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/bzzup/main.go
View File

@ -106,7 +106,7 @@ func (c *client) uploadFile(file string, fi os.FileInfo) (manifest, error) {
func (c *client) uploadDirectory(dir string) (manifest, error) { func (c *client) uploadDirectory(dir string) (manifest, error) {
dirm := manifest{} dirm := manifest{}
prefix := filepath.ToSlash(dir) + "/" prefix := filepath.ToSlash(filepath.Clean(dir)) + "/"
err := filepath.Walk(dir, func(path string, fi os.FileInfo, err error) error { err := filepath.Walk(dir, func(path string, fi os.FileInfo, err error) error {
if err != nil || fi.IsDir() { if err != nil || fi.IsDir() {
return err return err
@ -115,7 +115,7 @@ func (c *client) uploadDirectory(dir string) (manifest, error) {
return fmt.Errorf("path %s outside directory %s", path, dir) return fmt.Errorf("path %s outside directory %s", path, dir)
} }
entry, err := c.uploadFile(path, fi) entry, err := c.uploadFile(path, fi)
entry.Path = strings.TrimPrefix(filepath.ToSlash(path), prefix) entry.Path = strings.TrimPrefix(filepath.ToSlash(filepath.Clean(path)), prefix)
dirm.Entries = append(dirm.Entries, entry) dirm.Entries = append(dirm.Entries, entry)
return err return err
}) })