diff options
| author | Viktor Trón <viktor.tron@gmail.com> | 2018-09-27 13:10:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 13:10:22 +0800 |
| commit | e39a9b3480af0ac8044294f46e0e9e4c3948d23c (patch) | |
| tree | bb213b42cbbcea6ceeb982eee1f0d09efcdb1b44 /cmd/swarm/upload.go | |
| parent | c3cfdfacd00bf61c3f6ffaf7714b084f62de635c (diff) | |
| parent | 09dde380f906b943eb834b7b93c1afa0c2e49b46 (diff) | |
| download | dexon-e39a9b3480af0ac8044294f46e0e9e4c3948d23c.tar dexon-e39a9b3480af0ac8044294f46e0e9e4c3948d23c.tar.gz dexon-e39a9b3480af0ac8044294f46e0e9e4c3948d23c.tar.bz2 dexon-e39a9b3480af0ac8044294f46e0e9e4c3948d23c.tar.lz dexon-e39a9b3480af0ac8044294f46e0e9e4c3948d23c.tar.xz dexon-e39a9b3480af0ac8044294f46e0e9e4c3948d23c.tar.zst dexon-e39a9b3480af0ac8044294f46e0e9e4c3948d23c.zip | |
Merge pull request #17755 from JekaMas/implement-home-directory-expansion
cmd/swarm: use expandPath for swarm cli path parameters
Diffstat (limited to 'cmd/swarm/upload.go')
| -rw-r--r-- | cmd/swarm/upload.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go index 9eae2a3f8..f76cb1b98 100644 --- a/cmd/swarm/upload.go +++ b/cmd/swarm/upload.go @@ -138,6 +138,12 @@ func upload(ctx *cli.Context) { // 3. cleans the path, e.g. /a/b/../c -> /a/c // Note, it has limitations, e.g. ~someuser/tmp will not be expanded func expandPath(p string) string { + if i := strings.Index(p, ":"); i > 0 { + return p + } + if i := strings.Index(p, "@"); i > 0 { + return p + } if strings.HasPrefix(p, "~/") || strings.HasPrefix(p, "~\\") { if home := homeDir(); home != "" { p = home + p[1:] |