potyarkin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

Use go-homedir to read the home directory more reliably

Browse source
This commit is contained in:
Nick Craig-Wood 2019-05-10 21:25:24 +01:00
parent 1fefa6adfd
commit edda6d91cd
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/sftp/sftp.go
View file

@ -19,6 +19,7 @@ import (
"sync"
"time"
homedir "github.com/mitchellh/go-homedir"
"github.com/ncw/rclone/fs"
"github.com/ncw/rclone/fs/config"
"github.com/ncw/rclone/fs/config/configmap"
@ -322,7 +323,10 @@ func (f *Fs) putSftpConnection(pc **conn, err error) {
func shellExpand(s string) string {
if s != "" {
if s[0] == '~' {
s = "${HOME}" + s[1:]
newS, err := homedir.Expand(s)
if err == nil {
s = newS
}
}
s = os.ExpandEnv(s)
}